cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pdion...@apache.org
Subject [57/63] [abbrv] cloudstack-docs-admin git commit: Modifing licence terms
Date Wed, 08 Feb 2017 01:19:10 GMT
Modifing licence terms

Suppression des fichiers binaires


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/27b06378
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/27b06378
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/27b06378

Branch: refs/heads/master
Commit: 27b0637835523d9dc7f53b1c621028773146f814
Parents: dce470e
Author: Antoine Le Morvan <antoine@le-morvan.com>
Authored: Sat Jan 7 10:29:56 2017 +0100
Committer: Antoine Le Morvan <antoine@le-morvan.com>
Committed: Wed Jan 11 23:09:37 2017 +0100

----------------------------------------------------------------------
 Makefile                                        |    2 +-
 .../CloudStackAdministrationDocumentation.pdf   |  Bin 3589414 -> 0 bytes
 make.sh                                         |    3 +
 source/locale/fr/LC_MESSAGES/_global.mo         |  Bin 464 -> 0 bytes
 source/locale/fr/LC_MESSAGES/_global.po         |   10 -
 source/locale/fr/LC_MESSAGES/accounts.mo        |  Bin 40654 -> 0 bytes
 source/locale/fr/LC_MESSAGES/accounts.po        |    6 -
 source/locale/fr/LC_MESSAGES/administration.mo  |  Bin 5466 -> 0 bytes
 source/locale/fr/LC_MESSAGES/administration.po  |    8 -
 source/locale/fr/LC_MESSAGES/api.mo             |  Bin 6025 -> 0 bytes
 source/locale/fr/LC_MESSAGES/api.po             |    8 -
 source/locale/fr/LC_MESSAGES/events.mo          |  Bin 19578 -> 0 bytes
 source/locale/fr/LC_MESSAGES/events.po          |    9 -
 source/locale/fr/LC_MESSAGES/hosts.mo           |  Bin 51626 -> 0 bytes
 source/locale/fr/LC_MESSAGES/hosts.po           |    9 -
 source/locale/fr/LC_MESSAGES/index.mo           |  Bin 2790 -> 0 bytes
 source/locale/fr/LC_MESSAGES/index.po           |    7 -
 source/locale/fr/LC_MESSAGES/management.mo      |  Bin 24881 -> 0 bytes
 source/locale/fr/LC_MESSAGES/management.po      |    6 -
 source/locale/fr/LC_MESSAGES/networking.mo      |  Bin 34007 -> 0 bytes
 source/locale/fr/LC_MESSAGES/networking.po      |    6 -
 .../networking/acquiring_an_ip_address.mo       |  Bin 2182 -> 0 bytes
 .../networking/acquiring_an_ip_address.po       |    6 -
 .../networking/advanced_zone_config.mo          |  Bin 9108 -> 0 bytes
 .../networking/advanced_zone_config.po          |    6 -
 .../LC_MESSAGES/networking/basic_zone_config.mo |  Bin 1222 -> 0 bytes
 .../LC_MESSAGES/networking/basic_zone_config.po |    6 -
 .../fr/LC_MESSAGES/networking/dns_and_dhcp.mo   |  Bin 849 -> 0 bytes
 .../fr/LC_MESSAGES/networking/dns_and_dhcp.po   |    6 -
 .../fr/LC_MESSAGES/networking/elastic_ips.mo    |  Bin 9976 -> 0 bytes
 .../fr/LC_MESSAGES/networking/elastic_ips.po    |    6 -
 .../external_firewalls_and_load_balancers.mo    |  Bin 2650 -> 0 bytes
 .../external_firewalls_and_load_balancers.po    |    6 -
 .../networking/global_server_load_balancing.mo  |  Bin 1606 -> 0 bytes
 .../networking/global_server_load_balancing.po  |    6 -
 .../LC_MESSAGES/networking/guest_ip_ranges.mo   |  Bin 1711 -> 0 bytes
 .../LC_MESSAGES/networking/guest_ip_ranges.po   |    6 -
 .../fr/LC_MESSAGES/networking/guest_traffic.mo  |  Bin 3456 -> 0 bytes
 .../fr/LC_MESSAGES/networking/guest_traffic.po  |    6 -
 .../networking/inter_vlan_routing.mo            |  Bin 7907 -> 0 bytes
 .../networking/inter_vlan_routing.po            |    6 -
 .../networking/ip_forwarding_and_firewalling.mo |  Bin 19142 -> 0 bytes
 .../networking/ip_forwarding_and_firewalling.po |    6 -
 .../LC_MESSAGES/networking/ip_load_balancing.mo |  Bin 1233 -> 0 bytes
 .../LC_MESSAGES/networking/ip_load_balancing.po |    6 -
 .../ip_reservation_in_guest_networks.mo         |  Bin 9113 -> 0 bytes
 .../ip_reservation_in_guest_networks.po         |    6 -
 .../isolation_in_advanced_zone_with_vlan.mo     |  Bin 5351 -> 0 bytes
 .../isolation_in_advanced_zone_with_vlan.po     |    6 -
 .../networking/multiple_guest_networks.mo       |  Bin 11171 -> 0 bytes
 .../networking/multiple_guest_networks.po       |    6 -
 .../networking/multiple_ip_ranges.mo            |  Bin 3653 -> 0 bytes
 .../networking/multiple_ip_ranges.po            |    6 -
 .../networking/multiple_ips_on_single_nic.mo    |  Bin 7321 -> 0 bytes
 .../networking/multiple_ips_on_single_nic.po    |    6 -
 .../multiple_subnets_in_shared_network.mo       |  Bin 5955 -> 0 bytes
 .../multiple_subnets_in_shared_network.po       |    6 -
 .../LC_MESSAGES/networking/networking_in_pod.mo |  Bin 2466 -> 0 bytes
 .../LC_MESSAGES/networking/networking_in_pod.po |    6 -
 .../networking/networking_in_zone.mo            |  Bin 1639 -> 0 bytes
 .../networking/networking_in_zone.po            |    6 -
 .../LC_MESSAGES/networking/palo_alto_config.mo  |  Bin 28800 -> 0 bytes
 .../LC_MESSAGES/networking/palo_alto_config.po  |    7 -
 .../networking/persistent_networks.mo           |  Bin 7214 -> 0 bytes
 .../networking/persistent_networks.po           |    6 -
 .../fr/LC_MESSAGES/networking/portable_ips.mo   |  Bin 7410 -> 0 bytes
 .../fr/LC_MESSAGES/networking/portable_ips.po   |    6 -
 .../public_ips_and_vlans_for_accounts.mo        |  Bin 7063 -> 0 bytes
 .../public_ips_and_vlans_for_accounts.po        |    7 -
 .../networking/releasing_an_ip_address.mo       |  Bin 1759 -> 0 bytes
 .../networking/releasing_an_ip_address.po       |    6 -
 .../LC_MESSAGES/networking/remote_access_vpn.mo |  Bin 8872 -> 0 bytes
 .../LC_MESSAGES/networking/remote_access_vpn.po |    7 -
 .../LC_MESSAGES/networking/security_groups.mo   |  Bin 4133 -> 0 bytes
 .../LC_MESSAGES/networking/security_groups.po   |    6 -
 .../LC_MESSAGES/networking/site_to_site_vpn.mo  |  Bin 22830 -> 0 bytes
 .../LC_MESSAGES/networking/site_to_site_vpn.po  |   10 -
 .../fr/LC_MESSAGES/networking/static_nat.mo     |  Bin 3192 -> 0 bytes
 .../fr/LC_MESSAGES/networking/static_nat.po     |    6 -
 .../networking/using_remote_access.mo           |  Bin 2992 -> 0 bytes
 .../networking/using_remote_access.po           |   10 -
 .../networking/virtual_private_cloud_config.mo  |  Bin 71166 -> 0 bytes
 .../networking/virtual_private_cloud_config.po  |    8 -
 source/locale/fr/LC_MESSAGES/networking2.mo     |  Bin 320180 -> 0 bytes
 source/locale/fr/LC_MESSAGES/networking2.po     |    8 -
 .../fr/LC_MESSAGES/networking_and_traffic.mo    |  Bin 127086 -> 0 bytes
 .../fr/LC_MESSAGES/networking_and_traffic.po    |    7 -
 source/locale/fr/LC_MESSAGES/plugins/quota.mo   |  Bin 14354 -> 0 bytes
 source/locale/fr/LC_MESSAGES/plugins/quota.po   |   10 -
 source/locale/fr/LC_MESSAGES/projects.mo        |  Bin 32806 -> 0 bytes
 source/locale/fr/LC_MESSAGES/projects.po        |    6 -
 source/locale/fr/LC_MESSAGES/reliability.mo     |  Bin 19077 -> 0 bytes
 source/locale/fr/LC_MESSAGES/reliability.po     |    7 -
 .../locale/fr/LC_MESSAGES/service_offerings.mo  |  Bin 52868 -> 0 bytes
 .../locale/fr/LC_MESSAGES/service_offerings.po  |    8 -
 source/locale/fr/LC_MESSAGES/storage.mo         |  Bin 5578 -> 0 bytes
 source/locale/fr/LC_MESSAGES/storage.po         |    7 -
 source/locale/fr/LC_MESSAGES/systemvm.mo        |  Bin 41239 -> 0 bytes
 source/locale/fr/LC_MESSAGES/systemvm.po        |    7 -
 source/locale/fr/LC_MESSAGES/templates.mo       |  Bin 52697 -> 0 bytes
 source/locale/fr/LC_MESSAGES/templates.po       |    7 -
 .../fr/LC_MESSAGES/templates/_convert_hyperv.mo |  Bin 858 -> 0 bytes
 .../fr/LC_MESSAGES/templates/_convert_hyperv.po |    8 -
 .../fr/LC_MESSAGES/templates/_create_linux.mo   |  Bin 10966 -> 0 bytes
 .../fr/LC_MESSAGES/templates/_create_linux.po   |    8 -
 .../fr/LC_MESSAGES/templates/_create_windows.mo |  Bin 16114 -> 0 bytes
 .../fr/LC_MESSAGES/templates/_create_windows.po |    8 -
 .../fr/LC_MESSAGES/templates/_import_ami.mo     |  Bin 2760 -> 0 bytes
 .../fr/LC_MESSAGES/templates/_import_ami.po     |    8 -
 .../fr/LC_MESSAGES/templates/_password.mo       |  Bin 5148 -> 0 bytes
 .../fr/LC_MESSAGES/templates/_password.po       |    8 -
 source/locale/fr/LC_MESSAGES/troubleshooting.mo |  Bin 20612 -> 0 bytes
 source/locale/fr/LC_MESSAGES/troubleshooting.po |    6 -
 source/locale/fr/LC_MESSAGES/tuning.mo          |  Bin 7835 -> 0 bytes
 source/locale/fr/LC_MESSAGES/tuning.po          |    6 -
 source/locale/fr/LC_MESSAGES/ui.mo              |  Bin 13243 -> 0 bytes
 source/locale/fr/LC_MESSAGES/ui.po              |    6 -
 source/locale/fr/LC_MESSAGES/usage.mo           |  Bin 3756 -> 0 bytes
 source/locale/fr/LC_MESSAGES/usage.po           |    6 -
 .../locale/fr/LC_MESSAGES/virtual_machines.mo   |  Bin 13501 -> 0 bytes
 .../locale/fr/LC_MESSAGES/virtual_machines.po   | 1095 +++++++++---------
 .../LC_MESSAGES/virtual_machines/user-data.mo   |  Bin 6240 -> 0 bytes
 .../LC_MESSAGES/virtual_machines/user-data.po   |    8 -
 123 files changed, 521 insertions(+), 986 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 459cd8b..f6b2401 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    = -D language='fr' 
+SPHINXOPTS    = 
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/build/latex/CloudStackAdministrationDocumentation.pdf
----------------------------------------------------------------------
diff --git a/build/latex/CloudStackAdministrationDocumentation.pdf b/build/latex/CloudStackAdministrationDocumentation.pdf
deleted file mode 100644
index 0fa3604..0000000
Binary files a/build/latex/CloudStackAdministrationDocumentation.pdf and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/make.sh
----------------------------------------------------------------------
diff --git a/make.sh b/make.sh
new file mode 100755
index 0000000..d4e96fd
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,3 @@
+rm -fr build
+mkdir build
+sphinx-build -b html source build

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/_global.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/_global.mo b/source/locale/fr/LC_MESSAGES/_global.mo
deleted file mode 100644
index fb2aa68..0000000
Binary files a/source/locale/fr/LC_MESSAGES/_global.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 0be4762..4e235b1 100644
--- a/source/locale/fr/LC_MESSAGES/_global.po
+++ b/source/locale/fr/LC_MESSAGES/_global.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,15 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/accounts.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/accounts.mo b/source/locale/fr/LC_MESSAGES/accounts.mo
deleted file mode 100644
index a2b6b56..0000000
Binary files a/source/locale/fr/LC_MESSAGES/accounts.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 d67b0fb..5934588 100644
--- a/source/locale/fr/LC_MESSAGES/accounts.po
+++ b/source/locale/fr/LC_MESSAGES/accounts.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,11 +15,6 @@
 # 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

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/administration.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/administration.mo b/source/locale/fr/LC_MESSAGES/administration.mo
deleted file mode 100644
index ea81bbc..0000000
Binary files a/source/locale/fr/LC_MESSAGES/administration.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 46ea7ea..3f9d19e 100644
--- a/source/locale/fr/LC_MESSAGES/administration.po
+++ b/source/locale/fr/LC_MESSAGES/administration.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,13 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/api.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/api.mo b/source/locale/fr/LC_MESSAGES/api.mo
deleted file mode 100644
index 9d27379..0000000
Binary files a/source/locale/fr/LC_MESSAGES/api.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 67bd8fe..8c3bd69 100644
--- a/source/locale/fr/LC_MESSAGES/api.po
+++ b/source/locale/fr/LC_MESSAGES/api.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,13 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/events.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/events.mo b/source/locale/fr/LC_MESSAGES/events.mo
deleted file mode 100644
index f470297..0000000
Binary files a/source/locale/fr/LC_MESSAGES/events.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 7f8ba41..00f9ec5 100644
--- a/source/locale/fr/LC_MESSAGES/events.po
+++ b/source/locale/fr/LC_MESSAGES/events.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,14 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/hosts.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/hosts.mo b/source/locale/fr/LC_MESSAGES/hosts.mo
deleted file mode 100644
index 6b89ec7..0000000
Binary files a/source/locale/fr/LC_MESSAGES/hosts.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 ad23346..61f5917 100644
--- a/source/locale/fr/LC_MESSAGES/hosts.po
+++ b/source/locale/fr/LC_MESSAGES/hosts.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,14 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/index.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/index.mo b/source/locale/fr/LC_MESSAGES/index.mo
deleted file mode 100644
index 3c275c0..0000000
Binary files a/source/locale/fr/LC_MESSAGES/index.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 9cf0f9d..0a49676 100644
--- a/source/locale/fr/LC_MESSAGES/index.po
+++ b/source/locale/fr/LC_MESSAGES/index.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,12 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/management.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/management.mo b/source/locale/fr/LC_MESSAGES/management.mo
deleted file mode 100644
index b586878..0000000
Binary files a/source/locale/fr/LC_MESSAGES/management.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 6e198b5..984d0ca 100644
--- a/source/locale/fr/LC_MESSAGES/management.po
+++ b/source/locale/fr/LC_MESSAGES/management.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking.mo b/source/locale/fr/LC_MESSAGES/networking.mo
deleted file mode 100644
index c971670..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 f29fc2d..4375ad3 100644
--- a/source/locale/fr/LC_MESSAGES/networking.po
+++ b/source/locale/fr/LC_MESSAGES/networking.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.mo b/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.mo
deleted file mode 100644
index 1cf519c..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 2f3da54..08c8dc4 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.mo b/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.mo
deleted file mode 100644
index 008fcc5..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 a22b77b..2d917da 100644
--- a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po
+++ b/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.mo b/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.mo
deleted file mode 100644
index 59be817..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 c81ad86..3c876b1 100644
--- a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po
+++ b/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.mo b/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.mo
deleted file mode 100644
index be31914..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 b36ea56..7d0985f 100644
--- a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po
+++ b/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/elastic_ips.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.mo b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.mo
deleted file mode 100644
index 447ce08..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 9b0adde..e295668 100644
--- a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
+++ b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.mo b/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.mo
deleted file mode 100644
index 072536d..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 e469943..c612890 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.mo b/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.mo
deleted file mode 100644
index 5949f28..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 5201851..dd79592 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.mo b/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.mo
deleted file mode 100644
index 0c7823f..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 a8df576..defe0d1 100644
--- a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po
+++ b/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/guest_traffic.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.mo b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.mo
deleted file mode 100644
index 786855a..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 0701be6..18dc92c 100644
--- a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
+++ b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.mo b/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.mo
deleted file mode 100644
index 77d4ba4..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 bff56b8..8f6ef91 100644
--- a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po
+++ b/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.mo b/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.mo
deleted file mode 100644
index 5601997..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 ded49ae..79e2cf2 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.mo b/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.mo
deleted file mode 100644
index 008a180..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 421304f..1340e13 100644
--- a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po
+++ b/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.mo b/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.mo
deleted file mode 100644
index 998bfaa..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 b542b54..58b3acb 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.mo b/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.mo
deleted file mode 100644
index 854e139..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 991578a..8ae74af 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.mo b/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.mo
deleted file mode 100644
index a7fc583..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 3078a22..ae7da2a 100644
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po
+++ b/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.mo b/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.mo
deleted file mode 100644
index 4b4ff30..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 62cef0f..e8b1811 100644
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po
+++ b/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.mo b/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.mo
deleted file mode 100644
index 6b85612..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 36dc789..18201df 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.mo b/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.mo
deleted file mode 100644
index 5d9b458..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 030e2f0..a9a881d 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.mo b/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.mo
deleted file mode 100644
index b7aa27f..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 cc82e4d..90bd52d 100644
--- a/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po
+++ b/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.mo b/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.mo
deleted file mode 100644
index 78816ec..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 78bc41e..93bb042 100644
--- a/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po
+++ b/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.mo b/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.mo
deleted file mode 100644
index 4a9f763..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 14a0568..9f0e88c 100644
--- a/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po
+++ b/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,12 +15,6 @@
 # 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 ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/persistent_networks.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.mo b/source/locale/fr/LC_MESSAGES/networking/persistent_networks.mo
deleted file mode 100644
index 0430999..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 0e29927..0041092 100644
--- a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
+++ b/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/portable_ips.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/portable_ips.mo b/source/locale/fr/LC_MESSAGES/networking/portable_ips.mo
deleted file mode 100644
index 2c2976a..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/portable_ips.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 58736d4..9e47787 100644
--- a/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
+++ b/source/locale/fr/LC_MESSAGES/networking/portable_ips.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.mo b/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.mo
deleted file mode 100644
index 1773230..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 8653e65..4cdccac 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,4 +1,3 @@
-<<<<<<< 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
@@ -16,12 +15,6 @@
 # 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 ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.mo b/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.mo
deleted file mode 100644
index f4afb55..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 6305505..3c6110f 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,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.mo b/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.mo
deleted file mode 100644
index 722e569..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 1bb4760..e41e107 100644
--- a/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po
+++ b/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,12 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/security_groups.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/security_groups.mo b/source/locale/fr/LC_MESSAGES/networking/security_groups.mo
deleted file mode 100644
index c970783..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/security_groups.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 4a4171a..da8b42d 100644
--- a/source/locale/fr/LC_MESSAGES/networking/security_groups.po
+++ b/source/locale/fr/LC_MESSAGES/networking/security_groups.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.mo b/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.mo
deleted file mode 100644
index 81fe5ba..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 9c5ba04..4b76ef9 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,4 +1,3 @@
-<<<<<<< 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
@@ -16,15 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/static_nat.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/static_nat.mo b/source/locale/fr/LC_MESSAGES/networking/static_nat.mo
deleted file mode 100644
index 276cd47..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/static_nat.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 1876651..94caabb 100644
--- a/source/locale/fr/LC_MESSAGES/networking/static_nat.po
+++ b/source/locale/fr/LC_MESSAGES/networking/static_nat.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/using_remote_access.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/using_remote_access.mo b/source/locale/fr/LC_MESSAGES/networking/using_remote_access.mo
deleted file mode 100644
index da12de7..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/using_remote_access.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 b6674b4..140aa13 100644
--- a/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po
+++ b/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,15 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.mo b/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.mo
deleted file mode 100644
index 820af7e..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 82410bd..f30df63 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,4 +1,3 @@
-<<<<<<< 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
@@ -16,13 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking2.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking2.mo b/source/locale/fr/LC_MESSAGES/networking2.mo
deleted file mode 100644
index 53fb742..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking2.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 a977a3d..c508b6f 100644
--- a/source/locale/fr/LC_MESSAGES/networking2.po
+++ b/source/locale/fr/LC_MESSAGES/networking2.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,13 +14,6 @@
 # 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 ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/networking_and_traffic.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/networking_and_traffic.mo b/source/locale/fr/LC_MESSAGES/networking_and_traffic.mo
deleted file mode 100644
index af583dc..0000000
Binary files a/source/locale/fr/LC_MESSAGES/networking_and_traffic.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 ee9df80..2287cc9 100644
--- a/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
+++ b/source/locale/fr/LC_MESSAGES/networking_and_traffic.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,12 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/plugins/quota.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/plugins/quota.mo b/source/locale/fr/LC_MESSAGES/plugins/quota.mo
deleted file mode 100644
index ecc6bd3..0000000
Binary files a/source/locale/fr/LC_MESSAGES/plugins/quota.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 7172ab1..860bac2 100644
--- a/source/locale/fr/LC_MESSAGES/plugins/quota.po
+++ b/source/locale/fr/LC_MESSAGES/plugins/quota.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,15 +15,6 @@
 # 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"

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/projects.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/projects.mo b/source/locale/fr/LC_MESSAGES/projects.mo
deleted file mode 100644
index f5bfabe..0000000
Binary files a/source/locale/fr/LC_MESSAGES/projects.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 1c077a6..2ec435b 100644
--- a/source/locale/fr/LC_MESSAGES/projects.po
+++ b/source/locale/fr/LC_MESSAGES/projects.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,11 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/reliability.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/reliability.mo b/source/locale/fr/LC_MESSAGES/reliability.mo
deleted file mode 100644
index 304e39f..0000000
Binary files a/source/locale/fr/LC_MESSAGES/reliability.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 a58881a..0054876 100644
--- a/source/locale/fr/LC_MESSAGES/reliability.po
+++ b/source/locale/fr/LC_MESSAGES/reliability.po
@@ -1,4 +1,3 @@
-<<<<<<< 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
@@ -16,12 +15,6 @@
 # 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 ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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
deleted file mode 100644
index 8cf3ec3..0000000
Binary files a/source/locale/fr/LC_MESSAGES/service_offerings.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 051fd8e..1e8762b 100644
--- a/source/locale/fr/LC_MESSAGES/service_offerings.po
+++ b/source/locale/fr/LC_MESSAGES/service_offerings.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,13 +14,6 @@
 # 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 ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/storage.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/storage.mo b/source/locale/fr/LC_MESSAGES/storage.mo
deleted file mode 100644
index 89f3260..0000000
Binary files a/source/locale/fr/LC_MESSAGES/storage.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 b63b20d..4f757b6 100644
--- a/source/locale/fr/LC_MESSAGES/storage.po
+++ b/source/locale/fr/LC_MESSAGES/storage.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,12 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/systemvm.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/systemvm.mo b/source/locale/fr/LC_MESSAGES/systemvm.mo
deleted file mode 100644
index 3ae1b27..0000000
Binary files a/source/locale/fr/LC_MESSAGES/systemvm.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 09c0975..de5616c 100644
--- a/source/locale/fr/LC_MESSAGES/systemvm.po
+++ b/source/locale/fr/LC_MESSAGES/systemvm.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,12 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/templates.mo b/source/locale/fr/LC_MESSAGES/templates.mo
deleted file mode 100644
index c7fcdd7..0000000
Binary files a/source/locale/fr/LC_MESSAGES/templates.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 b57c8c4..4f606f3 100644
--- a/source/locale/fr/LC_MESSAGES/templates.po
+++ b/source/locale/fr/LC_MESSAGES/templates.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,12 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C)
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 # Translators:
 msgid ""

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.mo b/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.mo
deleted file mode 100644
index 0584bfb..0000000
Binary files a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/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 1e647ec..7da450d 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po
@@ -1,4 +1,3 @@
-<<<<<<< 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,13 +14,6 @@
 # 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 ""


Mime
View raw message