http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/troubleshooting.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/troubleshooting.po index 008f103,43c2b46..6ed03ba --- a/source/locale/fr/LC_MESSAGES/troubleshooting.po +++ b/source/locale/fr/LC_MESSAGES/troubleshooting.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid ""
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/tuning.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/tuning.po index d259069,c9acb73..e9a4a0d --- a/source/locale/fr/LC_MESSAGES/tuning.po +++ b/source/locale/fr/LC_MESSAGES/tuning.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/ui.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/ui.po index e0d50c0,1c646fd..40cd9dc --- a/source/locale/fr/LC_MESSAGES/ui.po +++ b/source/locale/fr/LC_MESSAGES/ui.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/usage.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/usage.po index a40007e,f5a5f95..d274230 --- a/source/locale/fr/LC_MESSAGES/usage.po +++ b/source/locale/fr/LC_MESSAGES/usage.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/virtual_machines.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/virtual_machines.po index bbef617,44873bc..ee422a3 --- a/source/locale/fr/LC_MESSAGES/virtual_machines.po +++ b/source/locale/fr/LC_MESSAGES/virtual_machines.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" @@@ -21,7 -9,7 +28,11 @@@ msgstr " "Project-Id-Version: Apache CloudStack Administration RTD\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-08-22 13:55+0200\n" ++<<<<<<< HEAD +"PO-Revision-Date: 2016-12-27 12:33+0100\n" ++======= + "PO-Revision-Date: 2016-12-20 00:29+0100\n" ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d "Language-Team: French (http://www.transifex.com/ke4qqq/apache-cloudstack-"; "administration-rtd/language/fr/)\n" "MIME-Version: 1.0\n" @@@ -157,7 -145,7 +168,11 @@@ msgstr " #: ../../virtual_machines.rst:82 msgid "Monitor VMs for Max Capacity" ++<<<<<<< HEAD +msgstr "Surveiller la capacité maximale de VM" ++======= + msgstr "" ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d #: ../../virtual_machines.rst:84 msgid "" @@@ -230,7 -218,7 +245,11 @@@ msgstr "Cycle de vie d'une VM #: ../../virtual_machines.rst:135 msgid "Virtual machines can be in the following states:" ++<<<<<<< HEAD +msgstr "Les machines virtuelles peuvent se trouver dans les états suivants :" ++======= + msgstr "" ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d #: ../../virtual_machines.rst:137 msgid "|basic-deployment.png|" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po index 1fca365,b7c6355..b45849e --- a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po +++ b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po @@@ -1,19 -1,8 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # msgid "" msgstr ""
