Merge branch 'master' of https://github.com/lmrv/cloudstack-docs-admin
diff --git a/source/locale/fr/LC_MESSAGES/_global.po b/source/locale/fr/LC_MESSAGES/_global.po
index 4e235b1..0be4762 100644
--- a/source/locale/fr/LC_MESSAGES/_global.po
+++ b/source/locale/fr/LC_MESSAGES/_global.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,15 @@
# 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.
+#
+#, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
msgid ""
msgstr ""
"Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"
diff --git a/source/locale/fr/LC_MESSAGES/accounts.po b/source/locale/fr/LC_MESSAGES/accounts.po
index 3f04841..d67b0fb 100644
--- a/source/locale/fr/LC_MESSAGES/accounts.po
+++ b/source/locale/fr/LC_MESSAGES/accounts.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,14 @@
# 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"
diff --git a/source/locale/fr/LC_MESSAGES/administration.po b/source/locale/fr/LC_MESSAGES/administration.po
index 3f9d19e..46ea7ea 100644
--- a/source/locale/fr/LC_MESSAGES/administration.po
+++ b/source/locale/fr/LC_MESSAGES/administration.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,13 @@
# 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"
diff --git a/source/locale/fr/LC_MESSAGES/api.po b/source/locale/fr/LC_MESSAGES/api.po
index 8c3bd69..67bd8fe 100644
--- a/source/locale/fr/LC_MESSAGES/api.po
+++ b/source/locale/fr/LC_MESSAGES/api.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,13 @@
# 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"
diff --git a/source/locale/fr/LC_MESSAGES/events.po b/source/locale/fr/LC_MESSAGES/events.po
index 00f9ec5..7f8ba41 100644
--- a/source/locale/fr/LC_MESSAGES/events.po
+++ b/source/locale/fr/LC_MESSAGES/events.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,14 @@
# 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"
diff --git a/source/locale/fr/LC_MESSAGES/hosts.po b/source/locale/fr/LC_MESSAGES/hosts.po
index 61f5917..ad23346 100644
--- a/source/locale/fr/LC_MESSAGES/hosts.po
+++ b/source/locale/fr/LC_MESSAGES/hosts.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,14 @@
# 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"
diff --git a/source/locale/fr/LC_MESSAGES/index.po b/source/locale/fr/LC_MESSAGES/index.po
index 0a49676..9cf0f9d 100644
--- a/source/locale/fr/LC_MESSAGES/index.po
+++ b/source/locale/fr/LC_MESSAGES/index.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/management.po b/source/locale/fr/LC_MESSAGES/management.po
index 984d0ca..6e198b5 100644
--- a/source/locale/fr/LC_MESSAGES/management.po
+++ b/source/locale/fr/LC_MESSAGES/management.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/networking.po b/source/locale/fr/LC_MESSAGES/networking.po
index 4375ad3..f29fc2d 100644
--- a/source/locale/fr/LC_MESSAGES/networking.po
+++ b/source/locale/fr/LC_MESSAGES/networking.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 08c8dc4..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 2d917da..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 3c876b1..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 7d0985f..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
index e295668..9b0adde 100644
--- a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
+++ b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 c612890..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 dd79592..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 defe0d1..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
index 18dc92c..0701be6 100644
--- a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
+++ b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 8f6ef91..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 79e2cf2..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 1340e13..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 58b3acb..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 8ae74af..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 ae7da2a..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 e8b1811..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 18201df..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 a9a881d..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 90bd52d..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 93bb042..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 9f0e88c..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,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po b/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
index 0041092..0e29927 100644
--- a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
+++ b/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/networking/portable_ips.po b/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
index 9e47787..58736d4 100644
--- a/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
+++ b/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 4cdccac..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,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,12 @@
# 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 ""
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 3c6110f..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 e41e107..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/networking/security_groups.po b/source/locale/fr/LC_MESSAGES/networking/security_groups.po
index da8b42d..4a4171a 100644
--- a/source/locale/fr/LC_MESSAGES/networking/security_groups.po
+++ b/source/locale/fr/LC_MESSAGES/networking/security_groups.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 4b76ef9..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,4 @@
+<<<<<<< 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
@@ -15,6 +16,15 @@
# 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.
+#
+#, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
msgid ""
msgstr ""
"Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"
diff --git a/source/locale/fr/LC_MESSAGES/networking/static_nat.po b/source/locale/fr/LC_MESSAGES/networking/static_nat.po
index 94caabb..1876651 100644
--- a/source/locale/fr/LC_MESSAGES/networking/static_nat.po
+++ b/source/locale/fr/LC_MESSAGES/networking/static_nat.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
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 140aa13..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,4 @@
+<<<<<<< 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
@@ -15,6 +16,15 @@
# 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.
+#
+#, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
msgid ""
msgstr ""
"Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"
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 f30df63..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,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,13 @@
# 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"
diff --git a/source/locale/fr/LC_MESSAGES/networking2.po b/source/locale/fr/LC_MESSAGES/networking2.po
index c508b6f..a977a3d 100644
--- a/source/locale/fr/LC_MESSAGES/networking2.po
+++ b/source/locale/fr/LC_MESSAGES/networking2.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,13 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/networking_and_traffic.po b/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
index 2287cc9..ee9df80 100644
--- a/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
+++ b/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/plugins/quota.po b/source/locale/fr/LC_MESSAGES/plugins/quota.po
index 860bac2..7172ab1 100644
--- a/source/locale/fr/LC_MESSAGES/plugins/quota.po
+++ b/source/locale/fr/LC_MESSAGES/plugins/quota.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,15 @@
# 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.
+#
+#, fuzzy
+>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
msgid ""
msgstr ""
"Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n"
diff --git a/source/locale/fr/LC_MESSAGES/projects.po b/source/locale/fr/LC_MESSAGES/projects.po
index 2ec435b..1c077a6 100644
--- a/source/locale/fr/LC_MESSAGES/projects.po
+++ b/source/locale/fr/LC_MESSAGES/projects.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/reliability.po b/source/locale/fr/LC_MESSAGES/reliability.po
index 0054876..a58881a 100644
--- a/source/locale/fr/LC_MESSAGES/reliability.po
+++ b/source/locale/fr/LC_MESSAGES/reliability.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -15,6 +16,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/service_offerings.po b/source/locale/fr/LC_MESSAGES/service_offerings.po
index a33f571..051fd8e 100644
--- a/source/locale/fr/LC_MESSAGES/service_offerings.po
+++ b/source/locale/fr/LC_MESSAGES/service_offerings.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/storage.po b/source/locale/fr/LC_MESSAGES/storage.po
index 4f757b6..b63b20d 100644
--- a/source/locale/fr/LC_MESSAGES/storage.po
+++ b/source/locale/fr/LC_MESSAGES/storage.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/systemvm.po b/source/locale/fr/LC_MESSAGES/systemvm.po
index de5616c..09c0975 100644
--- a/source/locale/fr/LC_MESSAGES/systemvm.po
+++ b/source/locale/fr/LC_MESSAGES/systemvm.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates.po b/source/locale/fr/LC_MESSAGES/templates.po
index 4f606f3..b57c8c4 100644
--- a/source/locale/fr/LC_MESSAGES/templates.po
+++ b/source/locale/fr/LC_MESSAGES/templates.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po b/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
index 7da450d..1e647ec 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,13 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po b/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
index c8543a1..f616d3c 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,13 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po b/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
index 41376c9..3eb89ec 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,13 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po b/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
index 6929085..ce122d2 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,13 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_password.po b/source/locale/fr/LC_MESSAGES/templates/_password.po
index 6862aa6..32af16a 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_password.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_password.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,13 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/troubleshooting.po b/source/locale/fr/LC_MESSAGES/troubleshooting.po
index 008f103..6ed03ba 100644
--- a/source/locale/fr/LC_MESSAGES/troubleshooting.po
+++ b/source/locale/fr/LC_MESSAGES/troubleshooting.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/tuning.po b/source/locale/fr/LC_MESSAGES/tuning.po
index d259069..e9a4a0d 100644
--- a/source/locale/fr/LC_MESSAGES/tuning.po
+++ b/source/locale/fr/LC_MESSAGES/tuning.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/ui.po b/source/locale/fr/LC_MESSAGES/ui.po
index e0d50c0..40cd9dc 100644
--- a/source/locale/fr/LC_MESSAGES/ui.po
+++ b/source/locale/fr/LC_MESSAGES/ui.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/usage.po b/source/locale/fr/LC_MESSAGES/usage.po
index a40007e..d274230 100644
--- a/source/locale/fr/LC_MESSAGES/usage.po
+++ b/source/locale/fr/LC_MESSAGES/usage.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,11 @@
# 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 ""
diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines.po b/source/locale/fr/LC_MESSAGES/virtual_machines.po
index bbef617..ee422a3 100644
--- a/source/locale/fr/LC_MESSAGES/virtual_machines.po
+++ b/source/locale/fr/LC_MESSAGES/virtual_machines.po
@@ -1,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,12 @@
# 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 +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"
@@ -157,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 ""
@@ -230,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|"
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 1fca365..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,3 +1,4 @@
+<<<<<<< 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
@@ -14,6 +15,13 @@
# 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 ""
