commit dce470ef24d098d779e65729d56bcd4c5fc784d6
author Antoine Le Morvan <antoine@le-morvan.com> Sat Jan 07 10:00:48 2017 +0100
committer Antoine Le Morvan <antoine@le-morvan.com> Sat Jan 07 10:00:48 2017 +0100
tree 347572ab78e8eaefb1be3a789d486ed240733c0e
parent a6b15cb9e1fc6d332305d54e09e17728b5ebb507
parent 90ae7fbf97b86217bc4905ad51a4b8437f12b84d

Merge branch 'master' of https://github.com/lmrv/cloudstack-docs-admin

build/latex/CloudStackAdministrationDocumentation.pdf

diff --git a/build/latex/CloudStackAdministrationDocumentation.pdf b/build/latex/CloudStackAdministrationDocumentation.pdf
index d6e415d..0fa3604 100644
--- a/build/latex/CloudStackAdministrationDocumentation.pdf
+++ b/build/latex/CloudStackAdministrationDocumentation.pdf
Binary files differ

source/locale/fr/LC_MESSAGES/_global.po

diff --git a/source/locale/fr/LC_MESSAGES/_global.po b/source/locale/fr/LC_MESSAGES/_global.po
index 2a73714..0be4762 100644
--- a/source/locale/fr/LC_MESSAGES/_global.po
+++ b/source/locale/fr/LC_MESSAGES/_global.po
@@ -1,3 +1,22 @@
+<<<<<<< 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
@@ -5,6 +24,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"

source/locale/fr/LC_MESSAGES/accounts.po

diff --git a/source/locale/fr/LC_MESSAGES/accounts.po b/source/locale/fr/LC_MESSAGES/accounts.po
index a6bd6e8..d67b0fb 100644
--- a/source/locale/fr/LC_MESSAGES/accounts.po
+++ b/source/locale/fr/LC_MESSAGES/accounts.po
@@ -1,9 +1,29 @@
+<<<<<<< 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.
 #
 # Translators:
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

source/locale/fr/LC_MESSAGES/administration.po

diff --git a/source/locale/fr/LC_MESSAGES/administration.po b/source/locale/fr/LC_MESSAGES/administration.po
index ecc2a51..46ea7ea 100644
--- a/source/locale/fr/LC_MESSAGES/administration.po
+++ b/source/locale/fr/LC_MESSAGES/administration.po
@@ -1,8 +1,28 @@
+<<<<<<< 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.
 #
 # Translators:
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

source/locale/fr/LC_MESSAGES/api.po

diff --git a/source/locale/fr/LC_MESSAGES/api.po b/source/locale/fr/LC_MESSAGES/api.po
index c2fc974..67bd8fe 100644
--- a/source/locale/fr/LC_MESSAGES/api.po
+++ b/source/locale/fr/LC_MESSAGES/api.po
@@ -1,8 +1,28 @@
+<<<<<<< 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.
 #
 # Translators:
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

source/locale/fr/LC_MESSAGES/events.po

diff --git a/source/locale/fr/LC_MESSAGES/events.po b/source/locale/fr/LC_MESSAGES/events.po
index a9e407e..7f8ba41 100644
--- a/source/locale/fr/LC_MESSAGES/events.po
+++ b/source/locale/fr/LC_MESSAGES/events.po
@@ -1,9 +1,29 @@
+<<<<<<< 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.
 #
 # Translators:
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

source/locale/fr/LC_MESSAGES/hosts.po

diff --git a/source/locale/fr/LC_MESSAGES/hosts.po b/source/locale/fr/LC_MESSAGES/hosts.po
index 179c6e4..ad23346 100644
--- a/source/locale/fr/LC_MESSAGES/hosts.po
+++ b/source/locale/fr/LC_MESSAGES/hosts.po
@@ -1,9 +1,29 @@
+<<<<<<< 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.
 #
 # Translators:
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

source/locale/fr/LC_MESSAGES/index.po

diff --git a/source/locale/fr/LC_MESSAGES/index.po b/source/locale/fr/LC_MESSAGES/index.po
index e9e9815..9cf0f9d 100644
--- a/source/locale/fr/LC_MESSAGES/index.po
+++ b/source/locale/fr/LC_MESSAGES/index.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/management.po

diff --git a/source/locale/fr/LC_MESSAGES/management.po b/source/locale/fr/LC_MESSAGES/management.po
index f490ee1..6e198b5 100644
--- a/source/locale/fr/LC_MESSAGES/management.po
+++ b/source/locale/fr/LC_MESSAGES/management.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking.po

diff --git a/source/locale/fr/LC_MESSAGES/networking.po b/source/locale/fr/LC_MESSAGES/networking.po
index adc481e..f29fc2d 100644
--- a/source/locale/fr/LC_MESSAGES/networking.po
+++ b/source/locale/fr/LC_MESSAGES/networking.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po b/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po
index 22bf1c0..2f3da54 100644
--- a/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po
+++ b/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po b/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po
index 7d9fe6f..a22b77b 100644
--- a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po
+++ b/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po b/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po
index e8f99dd..c81ad86 100644
--- a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po
+++ b/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po b/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po
index 1d98ddd..b36ea56 100644
--- a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po
+++ b/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/elastic_ips.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
index d7604ff..9b0adde 100644
--- a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
+++ b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po b/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po
index f7eef7a..e469943 100644
--- a/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po
+++ b/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po b/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po
index 71a128e..5201851 100644
--- a/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po
+++ b/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po b/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po
index 7b9191e..a8df576 100644
--- a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po
+++ b/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/guest_traffic.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
index e3b505b..0701be6 100644
--- a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
+++ b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po b/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po
index a81eae7..bff56b8 100644
--- a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po
+++ b/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po b/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po
index 319e708..ded49ae 100644
--- a/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po
+++ b/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po b/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po
index 8b7e429..421304f 100644
--- a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po
+++ b/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.po b/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.po
index 3c3256f..b542b54 100644
--- a/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.po
+++ b/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.po b/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.po
index 51563cc..991578a 100644
--- a/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.po
+++ b/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po b/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po
index f5e0f26..3078a22 100644
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po
+++ b/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po b/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po
index 8cef98a..62cef0f 100644
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po
+++ b/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.po b/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.po
index 2f39417..36dc789 100644
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.po
+++ b/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po b/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po
index 9d4640f..030e2f0 100644
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po
+++ b/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po b/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po
index b4d93a8..cc82e4d 100644
--- a/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po
+++ b/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po b/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po
index afff0b3..78bc41e 100644
--- a/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po
+++ b/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po b/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po
index a0bfee6..14a0568 100644
--- a/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po
+++ b/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po
@@ -1,7 +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)
 # This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
 # 
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 # Translators:
 msgid ""
 msgstr ""

source/locale/fr/LC_MESSAGES/networking/persistent_networks.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po b/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
index a22ed6c..0e29927 100644
--- a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
+++ b/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/portable_ips.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/portable_ips.po b/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
index a6b5b59..58736d4 100644
--- a/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
+++ b/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po b/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po
index fb70571..8653e65 100644
--- a/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po
+++ b/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po
@@ -1,7 +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)
 # This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
 # 
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 # Translators:
 msgid ""
 msgstr ""

source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.po b/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.po
index 074d86f..6305505 100644
--- a/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.po
+++ b/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po b/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po
index fe87ee4..1bb4760 100644
--- a/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po
+++ b/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/security_groups.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/security_groups.po b/source/locale/fr/LC_MESSAGES/networking/security_groups.po
index ec18cbe..4a4171a 100644
--- a/source/locale/fr/LC_MESSAGES/networking/security_groups.po
+++ b/source/locale/fr/LC_MESSAGES/networking/security_groups.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.po b/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.po
index 34bb765..9c5ba04 100644
--- a/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.po
+++ b/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.po
@@ -1,3 +1,22 @@
+<<<<<<< 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
@@ -5,6 +24,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"

source/locale/fr/LC_MESSAGES/networking/static_nat.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/static_nat.po b/source/locale/fr/LC_MESSAGES/networking/static_nat.po
index 58d414b..1876651 100644
--- a/source/locale/fr/LC_MESSAGES/networking/static_nat.po
+++ b/source/locale/fr/LC_MESSAGES/networking/static_nat.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/networking/using_remote_access.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po b/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po
index e4ece6c..b6674b4 100644
--- a/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po
+++ b/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po
@@ -1,3 +1,22 @@
+<<<<<<< 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
@@ -5,6 +24,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"

source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.po

diff --git a/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.po b/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.po
index 176acbe..82410bd 100644
--- a/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.po
+++ b/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.po
@@ -1,8 +1,28 @@
+<<<<<<< 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.
 #
 # Translators:
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration RTD\n"

source/locale/fr/LC_MESSAGES/networking2.po

diff --git a/source/locale/fr/LC_MESSAGES/networking2.po b/source/locale/fr/LC_MESSAGES/networking2.po
index 79576da..a977a3d 100644
--- a/source/locale/fr/LC_MESSAGES/networking2.po
+++ b/source/locale/fr/LC_MESSAGES/networking2.po
@@ -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)
 # This file is distributed under the same license as the Apache CloudStack
 # Administration Documentation package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 msgid ""
 msgstr ""

source/locale/fr/LC_MESSAGES/networking_and_traffic.po

diff --git a/source/locale/fr/LC_MESSAGES/networking_and_traffic.po b/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
index a3ff945..ee9df80 100644
--- a/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
+++ b/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/plugins/quota.po

diff --git a/source/locale/fr/LC_MESSAGES/plugins/quota.po b/source/locale/fr/LC_MESSAGES/plugins/quota.po
index 2d88a73..7172ab1 100644
--- a/source/locale/fr/LC_MESSAGES/plugins/quota.po
+++ b/source/locale/fr/LC_MESSAGES/plugins/quota.po
@@ -1,3 +1,22 @@
+<<<<<<< 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
@@ -5,6 +24,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"

source/locale/fr/LC_MESSAGES/projects.po

diff --git a/source/locale/fr/LC_MESSAGES/projects.po b/source/locale/fr/LC_MESSAGES/projects.po
index 9076864..1c077a6 100644
--- a/source/locale/fr/LC_MESSAGES/projects.po
+++ b/source/locale/fr/LC_MESSAGES/projects.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/reliability.po

diff --git a/source/locale/fr/LC_MESSAGES/reliability.po b/source/locale/fr/LC_MESSAGES/reliability.po
index 20b925f..a58881a 100644
--- a/source/locale/fr/LC_MESSAGES/reliability.po
+++ b/source/locale/fr/LC_MESSAGES/reliability.po
@@ -1,7 +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)
 # This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
 # 
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 # Translators:
 msgid ""
 msgstr ""

source/locale/fr/LC_MESSAGES/service_offerings.mo

diff --git a/source/locale/fr/LC_MESSAGES/service_offerings.mo b/source/locale/fr/LC_MESSAGES/service_offerings.mo
index 3927e0a..8cf3ec3 100644
--- a/source/locale/fr/LC_MESSAGES/service_offerings.mo
+++ b/source/locale/fr/LC_MESSAGES/service_offerings.mo
Binary files differ

source/locale/fr/LC_MESSAGES/service_offerings.po

diff --git a/source/locale/fr/LC_MESSAGES/service_offerings.po b/source/locale/fr/LC_MESSAGES/service_offerings.po
index 6086a0e..051fd8e 100644
--- a/source/locale/fr/LC_MESSAGES/service_offerings.po
+++ b/source/locale/fr/LC_MESSAGES/service_offerings.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/storage.po

diff --git a/source/locale/fr/LC_MESSAGES/storage.po b/source/locale/fr/LC_MESSAGES/storage.po
index 0b29fd4..b63b20d 100644
--- a/source/locale/fr/LC_MESSAGES/storage.po
+++ b/source/locale/fr/LC_MESSAGES/storage.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/systemvm.po

diff --git a/source/locale/fr/LC_MESSAGES/systemvm.po b/source/locale/fr/LC_MESSAGES/systemvm.po
index 66b3e7f..09c0975 100644
--- a/source/locale/fr/LC_MESSAGES/systemvm.po
+++ b/source/locale/fr/LC_MESSAGES/systemvm.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/templates.po

diff --git a/source/locale/fr/LC_MESSAGES/templates.po b/source/locale/fr/LC_MESSAGES/templates.po
index 6a250b4..b57c8c4 100644
--- a/source/locale/fr/LC_MESSAGES/templates.po
+++ b/source/locale/fr/LC_MESSAGES/templates.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po

diff --git a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po b/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
index a4111c9..1e647ec 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/templates/_create_linux.po

diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po b/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
index 9fe9bb3..f616d3c 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/templates/_create_windows.po

diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po b/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
index 7088635..3eb89ec 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/templates/_import_ami.po

diff --git a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po b/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
index 9e93911..ce122d2 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/templates/_password.po

diff --git a/source/locale/fr/LC_MESSAGES/templates/_password.po b/source/locale/fr/LC_MESSAGES/templates/_password.po
index 293c639..32af16a 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_password.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_password.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/troubleshooting.po

diff --git a/source/locale/fr/LC_MESSAGES/troubleshooting.po b/source/locale/fr/LC_MESSAGES/troubleshooting.po
index 43c2b46..6ed03ba 100644
--- a/source/locale/fr/LC_MESSAGES/troubleshooting.po
+++ b/source/locale/fr/LC_MESSAGES/troubleshooting.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/tuning.po

diff --git a/source/locale/fr/LC_MESSAGES/tuning.po b/source/locale/fr/LC_MESSAGES/tuning.po
index c9acb73..e9a4a0d 100644
--- a/source/locale/fr/LC_MESSAGES/tuning.po
+++ b/source/locale/fr/LC_MESSAGES/tuning.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/ui.po

diff --git a/source/locale/fr/LC_MESSAGES/ui.po b/source/locale/fr/LC_MESSAGES/ui.po
index 1c646fd..40cd9dc 100644
--- a/source/locale/fr/LC_MESSAGES/ui.po
+++ b/source/locale/fr/LC_MESSAGES/ui.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/usage.po

diff --git a/source/locale/fr/LC_MESSAGES/usage.po b/source/locale/fr/LC_MESSAGES/usage.po
index f5a5f95..d274230 100644
--- a/source/locale/fr/LC_MESSAGES/usage.po
+++ b/source/locale/fr/LC_MESSAGES/usage.po
@@ -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 ""

source/locale/fr/LC_MESSAGES/virtual_machines.mo

diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines.mo b/source/locale/fr/LC_MESSAGES/virtual_machines.mo
index 5b6642c..2fa0de6 100644
--- a/source/locale/fr/LC_MESSAGES/virtual_machines.mo
+++ b/source/locale/fr/LC_MESSAGES/virtual_machines.mo
Binary files differ

source/locale/fr/LC_MESSAGES/virtual_machines.po

diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines.po b/source/locale/fr/LC_MESSAGES/virtual_machines.po
index 44873bc..ee422a3 100644
--- a/source/locale/fr/LC_MESSAGES/virtual_machines.po
+++ b/source/locale/fr/LC_MESSAGES/virtual_machines.po
@@ -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 ""
@@ -9,7 +28,11 @@
 "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"
@@ -145,7 +168,11 @@
 
 #: ../../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 ""
@@ -218,7 +245,11 @@
 
 #: ../../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|"

source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po

diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
index b7c6355..b45849e 100644
--- a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
+++ b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
@@ -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 ""