Modifing licence terms
Suppression des fichiers binaires
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
diff --git a/build/latex/CloudStackAdministrationDocumentation.pdf b/build/latex/CloudStackAdministrationDocumentation.pdf
deleted file mode 100644
index 0fa3604..0000000
--- a/build/latex/CloudStackAdministrationDocumentation.pdf
+++ /dev/null
Binary files differ
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
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
--- a/source/locale/fr/LC_MESSAGES/_global.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/accounts.mo
+++ /dev/null
Binary files differ
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
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
--- a/source/locale/fr/LC_MESSAGES/administration.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/api.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/events.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/hosts.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/index.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/management.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/portable_ips.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/security_groups.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/networking/static_nat.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking/using_remote_access.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/networking2.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/networking_and_traffic.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/plugins/quota.mo
+++ /dev/null
Binary files differ
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"
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
--- a/source/locale/fr/LC_MESSAGES/projects.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/reliability.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/service_offerings.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/storage.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/systemvm.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/templates.mo
+++ /dev/null
Binary files differ
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 ""
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
--- a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.mo
+++ /dev/null
Binary files differ
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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_linux.mo b/source/locale/fr/LC_MESSAGES/templates/_create_linux.mo
deleted file mode 100644
index 8ed9184..0000000
--- a/source/locale/fr/LC_MESSAGES/templates/_create_linux.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po b/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
index f616d3c..c8543a1 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_create_linux.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_windows.mo b/source/locale/fr/LC_MESSAGES/templates/_create_windows.mo
deleted file mode 100644
index d27e807..0000000
--- a/source/locale/fr/LC_MESSAGES/templates/_create_windows.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po b/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
index 3eb89ec..41376c9 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_create_windows.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_import_ami.mo b/source/locale/fr/LC_MESSAGES/templates/_import_ami.mo
deleted file mode 100644
index 7fa6288..0000000
--- a/source/locale/fr/LC_MESSAGES/templates/_import_ami.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po b/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
index ce122d2..6929085 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_import_ami.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/templates/_password.mo b/source/locale/fr/LC_MESSAGES/templates/_password.mo
deleted file mode 100644
index dd10533..0000000
--- a/source/locale/fr/LC_MESSAGES/templates/_password.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/templates/_password.po b/source/locale/fr/LC_MESSAGES/templates/_password.po
index 32af16a..6862aa6 100644
--- a/source/locale/fr/LC_MESSAGES/templates/_password.po
+++ b/source/locale/fr/LC_MESSAGES/templates/_password.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/troubleshooting.mo b/source/locale/fr/LC_MESSAGES/troubleshooting.mo
deleted file mode 100644
index c5d95b9..0000000
--- a/source/locale/fr/LC_MESSAGES/troubleshooting.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/troubleshooting.po b/source/locale/fr/LC_MESSAGES/troubleshooting.po
index 6ed03ba..008f103 100644
--- a/source/locale/fr/LC_MESSAGES/troubleshooting.po
+++ b/source/locale/fr/LC_MESSAGES/troubleshooting.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/tuning.mo b/source/locale/fr/LC_MESSAGES/tuning.mo
deleted file mode 100644
index 811718b..0000000
--- a/source/locale/fr/LC_MESSAGES/tuning.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/tuning.po b/source/locale/fr/LC_MESSAGES/tuning.po
index e9a4a0d..d259069 100644
--- a/source/locale/fr/LC_MESSAGES/tuning.po
+++ b/source/locale/fr/LC_MESSAGES/tuning.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/ui.mo b/source/locale/fr/LC_MESSAGES/ui.mo
deleted file mode 100644
index e4a4e58..0000000
--- a/source/locale/fr/LC_MESSAGES/ui.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/ui.po b/source/locale/fr/LC_MESSAGES/ui.po
index 40cd9dc..e0d50c0 100644
--- a/source/locale/fr/LC_MESSAGES/ui.po
+++ b/source/locale/fr/LC_MESSAGES/ui.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/usage.mo b/source/locale/fr/LC_MESSAGES/usage.mo
deleted file mode 100644
index f6b0e54..0000000
--- a/source/locale/fr/LC_MESSAGES/usage.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/usage.po b/source/locale/fr/LC_MESSAGES/usage.po
index d274230..a40007e 100644
--- a/source/locale/fr/LC_MESSAGES/usage.po
+++ b/source/locale/fr/LC_MESSAGES/usage.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 ""
diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines.mo b/source/locale/fr/LC_MESSAGES/virtual_machines.mo
deleted file mode 100644
index 2fa0de6..0000000
--- a/source/locale/fr/LC_MESSAGES/virtual_machines.mo
+++ /dev/null
Binary files differ
diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines.po b/source/locale/fr/LC_MESSAGES/virtual_machines.po
index ee422a3..c0dee73 100644
--- a/source/locale/fr/LC_MESSAGES/virtual_machines.po
+++ b/source/locale/fr/LC_MESSAGES/virtual_machines.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 ""
@@ -28,18 +21,12 @@
"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"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.3.4\n"
+"PO-Revision-Date: \n"
"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"X-Generator: Poedit 1.8.11\n"
@@ -53,52 +40,48 @@
#: ../../virtual_machines.rst:23
msgid ""
-"CloudStack provides administrators with complete control over the lifecycle of "
-"all guest VMs executing in the cloud. CloudStack provides several guest "
-"management operations for end users and administrators. VMs may be stopped, "
-"started, rebooted, and destroyed."
+"CloudStack provides administrators with complete control over the lifecycle of all "
+"guest VMs executing in the cloud. CloudStack provides several guest management "
+"operations for end users and administrators. VMs may be stopped, started, rebooted, "
+"and destroyed."
msgstr ""
-"CloudStack fournit aux administrateurs un contrôle complet du cycle de vie de "
-"toutes les VM invitées exécutées dans le cloud. CloudStack fournit différentes "
-"opérations de gestion des invités aux utilisateurs finaux et aux "
-"administrateurs. Les VMs peuvent être stoppées, démarrées, redémarrées et "
-"détruites."
+"CloudStack fournit aux administrateurs le contrôle complet du cycle de vie de toutes "
+"les VM invitées s'exécutant dans le cloud. CloudStack fournit plusieurs opérations "
+"de gestion des invités aux utilisateurs finaux et aux administrateurs. Les VM "
+"peuvent être arrêtées, démarrées, redémarrées et détruites."
#: ../../virtual_machines.rst:28
msgid ""
-"Guest VMs have a name and group. VM names and groups are opaque to CloudStack "
-"and are available for end users to organize their VMs. Each VM can have three "
-"names for use in different contexts. Only two of these names can be controlled "
-"by the user:"
+"Guest VMs have a name and group. VM names and groups are opaque to CloudStack and "
+"are available for end users to organize their VMs. Each VM can have three names for "
+"use in different contexts. Only two of these names can be controlled by the user:"
msgstr ""
-"Les VM invitées ont un nom et un groupe. Les noms des VM et les groupes sont "
-"opaques pour CloudStack et sont utiles aux utilisateurs finaux pour organiser "
-"leurs VM. Chaque VM peut avoir trois noms différents pour utiliser dans "
-"différents contextes. Seulement deux de ces noms sont contrôlés par "
-"l'utilisateur :"
+"Les VM invitées ont un nom et un groupe. Les noms et groupes de VM sont opaques à "
+"CloudStack et sont disponibles pour que les utilisateurs finaux organisent leurs VM. "
+"Chaque VM peut avoir trois noms à utiliser dans différents contextes. Seuls deux de "
+"ces noms peuvent être contrôlés par l'utilisateur :"
#: ../../virtual_machines.rst:33
msgid ""
-"Instance name – a unique, immutable ID that is generated by CloudStack and can "
-"not be modified by the user. This name conforms to the requirements in IETF RFC "
-"1123."
+"Instance name – a unique, immutable ID that is generated by CloudStack and can not "
+"be modified by the user. This name conforms to the requirements in IETF RFC 1123."
msgstr ""
-"Nom de l'instance - un ID unique et non modifiable qui est généré par "
-"CloudStack et ne peut pas être modifié par l'utilisateur. Ce nom est conforme "
-"aux exigences de la RFC 1123 de l'IETF."
+"Nom de l'instance - un ID unique et non modifiable qui est généré par CloudStack et "
+"ne peut pas être modifié par l'utilisateur. Ce nom est conforme aux exigences de la "
+"RFC 1123 de l'IETF."
#: ../../virtual_machines.rst:37
msgid ""
-"Display name – the name displayed in the CloudStack web UI. Can be set by the "
-"user. Defaults to instance name."
+"Display name – the name displayed in the CloudStack web UI. Can be set by the user. "
+"Defaults to instance name."
msgstr ""
-"Nom affiché - le nom affiché dans l'interface web CloudStack. Peut être fixé "
-"par l'utilisateur. Prend par défaut le nom de l'instance."
+"Nom affiché - le nom affiché dans l'interface web CloudStack. Peut être fixé par "
+"l'utilisateur. Prend par défaut le nom de l'instance."
#: ../../virtual_machines.rst:40
msgid ""
-"Name – host name that the DHCP server assigns to the VM. Can be set by the "
-"user. Defaults to instance name"
+"Name – host name that the DHCP server assigns to the VM. Can be set by the user. "
+"Defaults to instance name"
msgstr ""
"Nom - nom de machine que le serveur DHCP assigne à la VM. Peut être fixé par "
"l'utilisateur. Prend par défaut le nom de l'instance."
@@ -109,28 +92,28 @@
"information, see `“Appending a Display Name to the Guest VM’s Internal Name” "
"<#appending-a-display-name-to-the-guest-vms-internal-name>`_."
msgstr ""
-"Vous pouvez ajouter le nom affiché d'une VM invitée à son nom interne. Pour "
-"plus d'informations, voir `“Ajouter un Nom d'Affichage au Nom Interne d'une VM "
-"invités.” <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+"Vous pouvez ajouter le nom affiché d'une VM invitée à son nom interne. Pour plus "
+"d'informations, voir `“Ajouter un Nom d'Affichage au Nom Interne d'une VM invités.” "
+"<#appending-a-display-name-to-the-guest-vms-internal-name>`_."
#: ../../virtual_machines.rst:48
msgid ""
"Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is "
-"monitored by the system. If the system detects that the VM is down, it will "
-"attempt to restart the VM, possibly on a different host. For more information, "
-"see HA-Enabled Virtual Machines on"
+"monitored by the system. If the system detects that the VM is down, it will attempt "
+"to restart the VM, possibly on a different host. For more information, see HA-"
+"Enabled Virtual Machines on"
msgstr ""
"Les VM invités peuvent être configuré pour être Hautement Disponible (HA). Une "
"VM dont la HA est activée est supervisée par le système. Si le système détecte "
-"que la VM est à l'arrêt, il va tenter de redémarrer la VM, si possible sur un "
-"hôte différent. Pour plus d'information, voir Activer la HA sur les Machines "
+"que la VM est à l'arrêt, il va tenter de redémarrer la VM, si possible sur un hÃ"
+"´te différent. Pour plus d'information, voir Activer la HA sur les Machines "
"Virtuelles."
#: ../../virtual_machines.rst:53
msgid ""
-"Each new VM is allocated one public IP address. When the VM is started, "
-"CloudStack automatically creates a static NAT between this public IP address "
-"and the private IP address of the VM."
+"Each new VM is allocated one public IP address. When the VM is started, CloudStack "
+"automatically creates a static NAT between this public IP address and the private IP "
+"address of the VM."
msgstr ""
"Chaque nouvelle VM se voit attribué une adresse IP Publique. Quand la VM est "
"démarrée, CloudStack crée automatiquement un NAT static entre cette adresse IP "
@@ -138,22 +121,22 @@
#: ../../virtual_machines.rst:57
msgid ""
-"If elastic IP is in use (with the NetScaler load balancer), the IP address "
-"initially allocated to the new VM is not marked as elastic. The user must "
-"replace the automatically configured IP with a specifically acquired elastic "
-"IP, and set up the static NAT mapping between this new IP and the guest VM’s "
-"private IP. The VM’s original IP address is then released and returned to the "
-"pool of available public IPs. Optionally, you can also decide not to allocate a "
-"public IP to a VM in an EIP-enabled Basic zone. For more information on Elastic "
-"IP, see `“About Elastic IP” <networking2.html#about-elastic-ip>`_."
+"If elastic IP is in use (with the NetScaler load balancer), the IP address initially "
+"allocated to the new VM is not marked as elastic. The user must replace the "
+"automatically configured IP with a specifically acquired elastic IP, and set up the "
+"static NAT mapping between this new IP and the guest VM’s private IP. The VM’s "
+"original IP address is then released and returned to the pool of available public "
+"IPs. Optionally, you can also decide not to allocate a public IP to a VM in an EIP-"
+"enabled Basic zone. For more information on Elastic IP, see `“About Elastic IP” "
+"<networking2.html#about-elastic-ip>`_."
msgstr ""
#: ../../virtual_machines.rst:67
msgid ""
-"CloudStack cannot distinguish a guest VM that was shut down by the user (such "
-"as with the “shutdown” command in Linux) from a VM that shut down unexpectedly. "
-"If an HA-enabled VM is shut down from inside the VM, CloudStack will restart "
-"it. To shut down an HA-enabled VM, you must go through the CloudStack UI or API."
+"CloudStack cannot distinguish a guest VM that was shut down by the user (such as "
+"with the “shutdown” command in Linux) from a VM that shut down unexpectedly. If an "
+"HA-enabled VM is shut down from inside the VM, CloudStack will restart it. To shut "
+"down an HA-enabled VM, you must go through the CloudStack UI or API."
msgstr ""
#: ../../virtual_machines.rst:75
@@ -162,34 +145,29 @@
#: ../../virtual_machines.rst:77
msgid ""
-"For VMs to work as expected and provide excellent service, follow these "
-"guidelines."
+"For VMs to work as expected and provide excellent service, follow these guidelines."
msgstr ""
#: ../../virtual_machines.rst:82
msgid "Monitor VMs for Max Capacity"
-<<<<<<< HEAD
msgstr "Surveiller la capacité maximale de VM"
-=======
-msgstr ""
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
#: ../../virtual_machines.rst:84
msgid ""
-"The CloudStack administrator should monitor the total number of VM instances in "
-"each cluster, and disable allocation to the cluster if the total is approaching "
-"the maximum that the hypervisor can handle. Be sure to leave a safety margin to "
-"allow for the possibility of one or more hosts failing, which would increase "
-"the VM load on the other hosts as the VMs are automatically redeployed. Consult "
-"the documentation for your chosen hypervisor to find the maximum permitted "
-"number of VMs per host, then use CloudStack global configuration settings to "
-"set this as the default limit. Monitor the VM activity in each cluster at all "
-"times. Keep the total number of VMs below a safe level that allows for the "
-"occasional host failure. For example, if there are N hosts in the cluster, and "
-"you want to allow for one host in the cluster to be down at any given time, the "
-"total number of VM instances you can permit in the cluster is at most (N-1) \\* "
-"(per-host-limit). Once a cluster reaches this number of VMs, use the CloudStack "
-"UI to disable allocation of more VMs to the cluster."
+"The CloudStack administrator should monitor the total number of VM instances in each "
+"cluster, and disable allocation to the cluster if the total is approaching the "
+"maximum that the hypervisor can handle. Be sure to leave a safety margin to allow "
+"for the possibility of one or more hosts failing, which would increase the VM load "
+"on the other hosts as the VMs are automatically redeployed. Consult the "
+"documentation for your chosen hypervisor to find the maximum permitted number of VMs "
+"per host, then use CloudStack global configuration settings to set this as the "
+"default limit. Monitor the VM activity in each cluster at all times. Keep the total "
+"number of VMs below a safe level that allows for the occasional host failure. For "
+"example, if there are N hosts in the cluster, and you want to allow for one host in "
+"the cluster to be down at any given time, the total number of VM instances you can "
+"permit in the cluster is at most (N-1) \\* (per-host-limit). Once a cluster reaches "
+"this number of VMs, use the CloudStack UI to disable allocation of more VMs to the "
+"cluster."
msgstr ""
#: ../../virtual_machines.rst:103
@@ -202,22 +180,21 @@
#: ../../virtual_machines.rst:107
msgid ""
-"For XenServer, install PV drivers and Xen tools on each VM. This will enable "
-"live migration and clean guest shutdown. Xen tools are required in order for "
-"dynamic CPU and RAM scaling to work."
+"For XenServer, install PV drivers and Xen tools on each VM. This will enable live "
+"migration and clean guest shutdown. Xen tools are required in order for dynamic CPU "
+"and RAM scaling to work."
msgstr ""
#: ../../virtual_machines.rst:111
msgid ""
-"For vSphere, install VMware Tools on each VM. This will enable console view to "
-"work properly. VMware Tools are required in order for dynamic CPU and RAM "
-"scaling to work."
+"For vSphere, install VMware Tools on each VM. This will enable console view to work "
+"properly. VMware Tools are required in order for dynamic CPU and RAM scaling to work."
msgstr ""
#: ../../virtual_machines.rst:115
msgid ""
-"To be sure that Xen tools or VMware Tools is installed, use one of the "
-"following techniques:"
+"To be sure that Xen tools or VMware Tools is installed, use one of the following "
+"techniques:"
msgstr ""
#: ../../virtual_machines.rst:118
@@ -227,16 +204,16 @@
#: ../../virtual_machines.rst:121
msgid ""
"When registering a new template, the administrator or user can indicate whether "
-"tools are installed on the template. This can be done through the UI or using "
-"the updateTemplate API; or,"
+"tools are installed on the template. This can be done through the UI or using the "
+"updateTemplate API; or,"
msgstr ""
#: ../../virtual_machines.rst:125
msgid ""
-"If a user deploys a virtual machine with a template that does not have Xen "
-"tools or VMware Tools, and later installs the tools on the VM, then the user "
-"can inform CloudStack using the updateVirtualMachine API. After installing the "
-"tools and updating the virtual machine, stop and start the VM."
+"If a user deploys a virtual machine with a template that does not have Xen tools or "
+"VMware Tools, and later installs the tools on the VM, then the user can inform "
+"CloudStack using the updateVirtualMachine API. After installing the tools and "
+"updating the virtual machine, stop and start the VM."
msgstr ""
#: ../../virtual_machines.rst:133
@@ -245,11 +222,7 @@
#: ../../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|"
@@ -257,17 +230,17 @@
#: ../../virtual_machines.rst:139
msgid ""
-"Once a virtual machine is destroyed, it cannot be recovered. All the resources "
-"used by the virtual machine will be reclaimed by the system. This includes the "
-"virtual machine’s IP address."
+"Once a virtual machine is destroyed, it cannot be recovered. All the resources used "
+"by the virtual machine will be reclaimed by the system. This includes the virtual "
+"machine’s IP address."
msgstr ""
#: ../../virtual_machines.rst:143
msgid ""
-"A stop will attempt to gracefully shut down the operating system, which "
-"typically involves terminating all the running applications. If the operation "
-"system cannot be stopped, it will be forcefully terminated. This has the same "
-"effect as pulling the power cord to a physical machine."
+"A stop will attempt to gracefully shut down the operating system, which typically "
+"involves terminating all the running applications. If the operation system cannot be "
+"stopped, it will be forcefully terminated. This has the same effect as pulling the "
+"power cord to a physical machine."
msgstr ""
#: ../../virtual_machines.rst:149
@@ -276,20 +249,20 @@
#: ../../virtual_machines.rst:151
msgid ""
-"CloudStack preserves the state of the virtual machine hard disk until the "
-"machine is destroyed."
+"CloudStack preserves the state of the virtual machine hard disk until the machine is "
+"destroyed."
msgstr ""
#: ../../virtual_machines.rst:154
msgid ""
-"A running virtual machine may fail because of hardware or network issues. A "
-"failed virtual machine is in the down state."
+"A running virtual machine may fail because of hardware or network issues. A failed "
+"virtual machine is in the down state."
msgstr ""
#: ../../virtual_machines.rst:157
msgid ""
-"The system places the virtual machine into the down state if it does not "
-"receive the heartbeat from the hypervisor for three minutes."
+"The system places the virtual machine into the down state if it does not receive the "
+"heartbeat from the hypervisor for three minutes."
msgstr ""
#: ../../virtual_machines.rst:160
@@ -298,8 +271,8 @@
#: ../../virtual_machines.rst:162
msgid ""
-"The system will start the virtual machine from the down state automatically if "
-"the virtual machine is marked as HA-enabled."
+"The system will start the virtual machine from the down state automatically if the "
+"virtual machine is marked as HA-enabled."
msgstr ""
#: ../../virtual_machines.rst:167
@@ -308,18 +281,16 @@
#: ../../virtual_machines.rst:169
msgid ""
-"Virtual machines are usually created from a template. Users can also create "
-"blank virtual machines. A blank virtual machine is a virtual machine without an "
-"OS template. Users can attach an ISO file and install the OS from the CD/DVD-"
-"ROM."
+"Virtual machines are usually created from a template. Users can also create blank "
+"virtual machines. A blank virtual machine is a virtual machine without an OS "
+"template. Users can attach an ISO file and install the OS from the CD/DVD-ROM."
msgstr ""
#: ../../virtual_machines.rst:175
msgid ""
-"You can create a VM without starting it. You can determine whether the VM needs "
-"to be started as part of the VM deployment. A request parameter, startVM, in "
-"the deployVm API provides this feature. For more information, see the "
-"Developer's Guide."
+"You can create a VM without starting it. You can determine whether the VM needs to "
+"be started as part of the VM deployment. A request parameter, startVM, in the "
+"deployVm API provides this feature. For more information, see the Developer's Guide."
msgstr ""
#: ../../virtual_machines.rst:180
@@ -346,15 +317,14 @@
#: ../../virtual_machines.rst:190
msgid ""
-"Select a template, then follow the steps in the wizard. For more information "
-"about how the templates came to be in this list, see `*Working with Templates* "
-"<templates.html>`_."
+"Select a template, then follow the steps in the wizard. For more information about "
+"how the templates came to be in this list, see `*Working with Templates* <templates."
+"html>`_."
msgstr ""
#: ../../virtual_machines.rst:194
msgid ""
-"Be sure that the hardware you have allows starting the selected service "
-"offering."
+"Be sure that the hardware you have allows starting the selected service offering."
msgstr ""
#: ../../virtual_machines.rst:197 ../../virtual_machines.rst:222
@@ -363,8 +333,7 @@
#: ../../virtual_machines.rst:200
msgid ""
-"For security reason, the internal name of the VM is visible only to the root "
-"admin."
+"For security reason, the internal name of the VM is visible only to the root admin."
msgstr ""
#: ../../virtual_machines.rst:203
@@ -375,8 +344,8 @@
msgid ""
"(XenServer) Windows VMs running on XenServer require PV drivers, which may be "
"provided in the template or added after the VM is created. The PV drivers are "
-"necessary for essential management functions such as mounting additional "
-"volumes and ISO images, live migration, and graceful shutdown."
+"necessary for essential management functions such as mounting additional volumes and "
+"ISO images, live migration, and graceful shutdown."
msgstr ""
#: ../../virtual_machines.rst:220
@@ -389,8 +358,8 @@
#: ../../virtual_machines.rst:228
msgid ""
-"Any user can access their own virtual machines. The administrator can access "
-"all VMs running in the cloud."
+"Any user can access their own virtual machines. The administrator can access all VMs "
+"running in the cloud."
msgstr ""
"Tous les utilisateur peuvent accéder à leur propore machines virtuelles. "
"L'administrateur peut accéder à toute les VMs qui fonctionnent dans le cloud."
@@ -407,8 +376,7 @@
#: ../../virtual_machines.rst:235
msgid "Click Instances, then click the name of a running VM."
-msgstr ""
-"Cliquez sur Instances, puis choisissez le nom de la VM en cours d'éxécution."
+msgstr "Cliquez sur Instances, puis choisissez le nom de la VM en cours d'éxécution."
#: ../../virtual_machines.rst:237
msgid "Click the View Console button |console-icon.png|."
@@ -420,28 +388,26 @@
#: ../../virtual_machines.rst:241
msgid ""
-"The VM must have some port open to incoming traffic. For example, in a basic "
-"zone, a new VM might be assigned to a security group which allows incoming "
-"traffic. This depends on what security group you picked when creating the VM. "
-"In other cases, you can open a port by setting up a port forwarding policy. See "
-"`“IP Forwarding and Firewalling” <networking2.html#ip-forwarding-and-"
-"firewalling>`_."
+"The VM must have some port open to incoming traffic. For example, in a basic zone, a "
+"new VM might be assigned to a security group which allows incoming traffic. This "
+"depends on what security group you picked when creating the VM. In other cases, you "
+"can open a port by setting up a port forwarding policy. See `“IP Forwarding and "
+"Firewalling” <networking2.html#ip-forwarding-and-firewalling>`_."
msgstr ""
#: ../../virtual_machines.rst:248
msgid ""
-"If a port is open but you can not access the VM using ssh, it’s possible that "
-"ssh is not already enabled on the VM. This will depend on whether ssh is "
-"enabled in the template you picked when creating the VM. Access the VM through "
-"the CloudStack UI and enable ssh on the machine using the commands for the VM’s "
-"operating system."
+"If a port is open but you can not access the VM using ssh, it’s possible that ssh is "
+"not already enabled on the VM. This will depend on whether ssh is enabled in the "
+"template you picked when creating the VM. Access the VM through the CloudStack UI "
+"and enable ssh on the machine using the commands for the VM’s operating system."
msgstr ""
#: ../../virtual_machines.rst:254
msgid ""
-"If the network has an external firewall device, you will need to create a "
-"firewall rule to allow access. See `“IP Forwarding and Firewalling” "
-"<networking2.html#ip-forwarding-and-firewalling>`_."
+"If the network has an external firewall device, you will need to create a firewall "
+"rule to allow access. See `“IP Forwarding and Firewalling” <networking2.html#ip-"
+"forwarding-and-firewalling>`_."
msgstr ""
#: ../../virtual_machines.rst:260
@@ -450,9 +416,9 @@
#: ../../virtual_machines.rst:262
msgid ""
-"Once a VM instance is created, you can stop, restart, or delete it as needed. "
-"In the CloudStack UI, click Instances, select the VM, and use the Stop, Start, "
-"Reboot, and Destroy buttons."
+"Once a VM instance is created, you can stop, restart, or delete it as needed. In the "
+"CloudStack UI, click Instances, select the VM, and use the Stop, Start, Reboot, and "
+"Destroy buttons."
msgstr ""
#: ../../virtual_machines.rst:268
@@ -461,9 +427,8 @@
#: ../../virtual_machines.rst:270
msgid ""
-"At any point in time, each virtual machine instance is running on a single "
-"host. How does CloudStack determine which host to place a VM on? There are "
-"several ways:"
+"At any point in time, each virtual machine instance is running on a single host. How "
+"does CloudStack determine which host to place a VM on? There are several ways:"
msgstr ""
#: ../../virtual_machines.rst:274
@@ -474,44 +439,43 @@
#: ../../virtual_machines.rst:277
msgid ""
-"Instance type preferences. CloudStack administrators can specify that certain "
-"hosts should have a preference for particular types of guest instances. For "
-"example, an administrator could state that a host should have a preference to "
-"run Windows guests. The default host allocator will attempt to place guests of "
-"that OS type on such hosts first. If no such host is available, the allocator "
-"will place the instance wherever there is sufficient physical capacity."
+"Instance type preferences. CloudStack administrators can specify that certain hosts "
+"should have a preference for particular types of guest instances. For example, an "
+"administrator could state that a host should have a preference to run Windows "
+"guests. The default host allocator will attempt to place guests of that OS type on "
+"such hosts first. If no such host is available, the allocator will place the "
+"instance wherever there is sufficient physical capacity."
msgstr ""
#: ../../virtual_machines.rst:285
msgid ""
-"Vertical and horizontal allocation. Vertical allocation consumes all the "
-"resources of a given host before allocating any guests on a second host. This "
-"reduces power consumption in the cloud. Horizontal allocation places a guest on "
-"each host in a round-robin fashion. This may yield better performance to the "
-"guests in some cases."
+"Vertical and horizontal allocation. Vertical allocation consumes all the resources "
+"of a given host before allocating any guests on a second host. This reduces power "
+"consumption in the cloud. Horizontal allocation places a guest on each host in a "
+"round-robin fashion. This may yield better performance to the guests in some cases."
msgstr ""
#: ../../virtual_machines.rst:291
msgid ""
-"End user preferences. Users can not control exactly which host will run a given "
-"VM instance, but they can specify a zone for the VM. CloudStack is then "
-"restricted to allocating the VM only to one of the hosts in that zone."
+"End user preferences. Users can not control exactly which host will run a given VM "
+"instance, but they can specify a zone for the VM. CloudStack is then restricted to "
+"allocating the VM only to one of the hosts in that zone."
msgstr ""
#: ../../virtual_machines.rst:296
msgid ""
-"Host tags. The administrator can assign tags to hosts. These tags can be used "
-"to specify which host a VM should use. The CloudStack administrator decides "
-"whether to define host tags, then create a service offering using those tags "
-"and offer it to the user."
+"Host tags. The administrator can assign tags to hosts. These tags can be used to "
+"specify which host a VM should use. The CloudStack administrator decides whether to "
+"define host tags, then create a service offering using those tags and offer it to "
+"the user."
msgstr ""
#: ../../virtual_machines.rst:301
msgid ""
-"Affinity groups. By defining affinity groups and assigning VMs to them, the "
-"user or administrator can influence (but not dictate) which VMs should run on "
-"separate hosts. This feature is to let users specify that certain VMs won't be "
-"on the same host."
+"Affinity groups. By defining affinity groups and assigning VMs to them, the user or "
+"administrator can influence (but not dictate) which VMs should run on separate "
+"hosts. This feature is to let users specify that certain VMs won't be on the same "
+"host."
msgstr ""
#: ../../virtual_machines.rst:306
@@ -526,12 +490,12 @@
#: ../../virtual_machines.rst:314
msgid ""
-"By defining affinity groups and assigning VMs to them, the user or "
-"administrator can influence (but not dictate) which VMs should run on separate "
-"hosts. This feature is to let users specify that VMs with the same “host anti-"
-"affinity” type won’t be on the same host. This serves to increase fault "
-"tolerance. If a host fails, another VM offering the same service (for example, "
-"hosting the user's website) is still up and running on another host."
+"By defining affinity groups and assigning VMs to them, the user or administrator can "
+"influence (but not dictate) which VMs should run on separate hosts. This feature is "
+"to let users specify that VMs with the same “host anti-affinity” type won’t be on "
+"the same host. This serves to increase fault tolerance. If a host fails, another VM "
+"offering the same service (for example, hosting the user's website) is still up and "
+"running on another host."
msgstr ""
#: ../../virtual_machines.rst:322
@@ -565,11 +529,10 @@
#: ../../virtual_machines.rst:342
msgid ""
-"Type. The only supported type shipped with CloudStack is Host Anti-Affinity. "
-"This indicates that the VMs in this group should avoid being placed on the same "
-"host with each other. If you see other types in this list, it means that your "
-"installation of CloudStack has been extended with customized affinity group "
-"plugins."
+"Type. The only supported type shipped with CloudStack is Host Anti-Affinity. This "
+"indicates that the VMs in this group should avoid being placed on the same host with "
+"each other. If you see other types in this list, it means that your installation of "
+"CloudStack has been extended with customized affinity group plugins."
msgstr ""
#: ../../virtual_machines.rst:351
@@ -583,8 +546,8 @@
#: ../../virtual_machines.rst:355
msgid ""
"Create the VM as usual, as described in `“Creating VMs” <virtual_machines."
-"html#creating-vms>`_. In the Add Instance wizard, there is a new Affinity tab "
-"where you can select the affinity group."
+"html#creating-vms>`_. In the Add Instance wizard, there is a new Affinity tab where "
+"you can select the affinity group."
msgstr ""
#: ../../virtual_machines.rst:362
@@ -625,8 +588,8 @@
#: ../../virtual_machines.rst:388
msgid ""
-"From here, you can click the name of any VM in the list to access all its "
-"details and controls."
+"From here, you can click the name of any VM in the list to access all its details "
+"and controls."
msgstr ""
#: ../../virtual_machines.rst:393
@@ -643,10 +606,10 @@
#: ../../virtual_machines.rst:403
msgid ""
-"Any VM that is a member of the affinity group will be disassociated from the "
-"group. The former group members will continue to run normally on the current "
-"hosts, but if the VM is restarted, it will no longer follow the host allocation "
-"rules from its former affinity group."
+"Any VM that is a member of the affinity group will be disassociated from the group. "
+"The former group members will continue to run normally on the current hosts, but if "
+"the VM is restarted, it will no longer follow the host allocation rules from its "
+"former affinity group."
msgstr ""
#: ../../virtual_machines.rst:411
@@ -659,32 +622,31 @@
#: ../../virtual_machines.rst:415
msgid ""
-"In addition to the existing CloudStack ability to snapshot individual VM "
-"volumes, you can take a VM snapshot to preserve all the VM's data volumes as "
-"well as (optionally) its CPU/memory state. This is useful for quick restore of "
-"a VM. For example, you can snapshot a VM, then make changes such as software "
-"upgrades. If anything goes wrong, simply restore the VM to its previous state "
-"using the previously saved VM snapshot."
+"In addition to the existing CloudStack ability to snapshot individual VM volumes, "
+"you can take a VM snapshot to preserve all the VM's data volumes as well as "
+"(optionally) its CPU/memory state. This is useful for quick restore of a VM. For "
+"example, you can snapshot a VM, then make changes such as software upgrades. If "
+"anything goes wrong, simply restore the VM to its previous state using the "
+"previously saved VM snapshot."
msgstr ""
#: ../../virtual_machines.rst:423
msgid ""
"The snapshot is created using the hypervisor's native snapshot facility. The VM "
-"snapshot includes not only the data volumes, but optionally also whether the VM "
-"is running or turned off (CPU state) and the memory contents. The snapshot is "
-"stored in CloudStack's primary storage."
+"snapshot includes not only the data volumes, but optionally also whether the VM is "
+"running or turned off (CPU state) and the memory contents. The snapshot is stored in "
+"CloudStack's primary storage."
msgstr ""
#: ../../virtual_machines.rst:428
msgid ""
-"VM snapshots can have a parent/child relationship. Each successive snapshot of "
-"the same VM is the child of the snapshot that came before it. Each time you "
-"take an additional snapshot of the same VM, it saves only the differences "
-"between the current state of the VM and the state stored in the most recent "
-"previous snapshot. The previous snapshot becomes a parent, and the new snapshot "
-"is its child. It is possible to create a long chain of these parent/child "
-"snapshots, which amount to a \"redo\" record leading from the current state of "
-"the VM back to the original."
+"VM snapshots can have a parent/child relationship. Each successive snapshot of the "
+"same VM is the child of the snapshot that came before it. Each time you take an "
+"additional snapshot of the same VM, it saves only the differences between the "
+"current state of the VM and the state stored in the most recent previous snapshot. "
+"The previous snapshot becomes a parent, and the new snapshot is its child. It is "
+"possible to create a long chain of these parent/child snapshots, which amount to a "
+"\"redo\" record leading from the current state of the VM back to the original."
msgstr ""
#: ../../virtual_machines.rst:438
@@ -701,24 +663,21 @@
#: ../../virtual_machines.rst:447
msgid ""
-"If a VM has some stored snapshots, you can't attach new volume to the VM or "
-"delete any existing volumes. If you change the volumes on the VM, it would "
-"become impossible to restore the VM snapshot which was created with the "
-"previous volume structure. If you want to attach a volume to such a VM, first "
-"delete its snapshots."
+"If a VM has some stored snapshots, you can't attach new volume to the VM or delete "
+"any existing volumes. If you change the volumes on the VM, it would become "
+"impossible to restore the VM snapshot which was created with the previous volume "
+"structure. If you want to attach a volume to such a VM, first delete its snapshots."
msgstr ""
#: ../../virtual_machines.rst:453
msgid ""
-"VM snapshots which include both data volumes and memory can't be kept if you "
-"change the VM's service offering. Any existing VM snapshots of this type will "
-"be discarded."
+"VM snapshots which include both data volumes and memory can't be kept if you change "
+"the VM's service offering. Any existing VM snapshots of this type will be discarded."
msgstr ""
#: ../../virtual_machines.rst:457
msgid ""
-"You can't make a VM snapshot at the same time as you are taking a volume "
-"snapshot."
+"You can't make a VM snapshot at the same time as you are taking a volume snapshot."
msgstr ""
#: ../../virtual_machines.rst:460
@@ -735,8 +694,8 @@
#: ../../virtual_machines.rst:468
msgid ""
"The cloud administrator can use global configuration variables to control the "
-"behavior of VM snapshots. To set these variables, go through the Global "
-"Settings area of the CloudStack UI."
+"behavior of VM snapshots. To set these variables, go through the Global Settings "
+"area of the CloudStack UI."
msgstr ""
#: ../../virtual_machines.rst:472
@@ -753,10 +712,10 @@
#: ../../virtual_machines.rst:478
msgid ""
-"The maximum number of VM snapshots that can be saved for any given virtual "
-"machine in the cloud. The total possible number of VM snapshots in the cloud is "
-"(number of VMs) \\* vmsnapshots.max. If the number of snapshots for any VM ever "
-"hits the maximum, the older ones are removed by the snapshot expunge job."
+"The maximum number of VM snapshots that can be saved for any given virtual machine "
+"in the cloud. The total possible number of VM snapshots in the cloud is (number of "
+"VMs) \\* vmsnapshots.max. If the number of snapshots for any VM ever hits the "
+"maximum, the older ones are removed by the snapshot expunge job."
msgstr ""
#: ../../virtual_machines.rst:484
@@ -765,8 +724,8 @@
#: ../../virtual_machines.rst:486
msgid ""
-"Number of seconds to wait for a snapshot job to succeed before declaring "
-"failure and issuing an error."
+"Number of seconds to wait for a snapshot job to succeed before declaring failure and "
+"issuing an error."
msgstr ""
#: ../../virtual_machines.rst:491
@@ -795,37 +754,35 @@
#: ../../virtual_machines.rst:504
msgid ""
-"If a snapshot is already in progress, then clicking this button will have no "
-"effect."
+"If a snapshot is already in progress, then clicking this button will have no effect."
msgstr ""
#: ../../virtual_machines.rst:507
msgid ""
-"Provide a name and description. These will be displayed in the VM Snapshots "
-"list."
+"Provide a name and description. These will be displayed in the VM Snapshots list."
msgstr ""
#: ../../virtual_machines.rst:510
msgid ""
-"(For running VMs only) If you want to include the VM's memory in the snapshot, "
-"click the Memory checkbox. This saves the CPU and memory state of the virtual "
-"machine. If you don't check this box, then only the current state of the VM "
-"disk is saved. Checking this box makes the snapshot take longer."
+"(For running VMs only) If you want to include the VM's memory in the snapshot, click "
+"the Memory checkbox. This saves the CPU and memory state of the virtual machine. If "
+"you don't check this box, then only the current state of the VM disk is saved. "
+"Checking this box makes the snapshot take longer."
msgstr ""
#: ../../virtual_machines.rst:516
msgid ""
-"Quiesce VM: check this box if you want to quiesce the file system on the VM "
-"before taking the snapshot. Not supported on XenServer when used with "
-"CloudStack-provided primary storage."
+"Quiesce VM: check this box if you want to quiesce the file system on the VM before "
+"taking the snapshot. Not supported on XenServer when used with CloudStack-provided "
+"primary storage."
msgstr ""
#: ../../virtual_machines.rst:520
msgid ""
"When this option is used with CloudStack-provided primary storage, the quiesce "
-"operation is performed by the underlying hypervisor (VMware is supported). When "
-"used with another primary storage vendor's plugin, the quiesce operation is "
-"provided according to the vendor's implementation."
+"operation is performed by the underlying hypervisor (VMware is supported). When used "
+"with another primary storage vendor's plugin, the quiesce operation is provided "
+"according to the vendor's implementation."
msgstr ""
#: ../../virtual_machines.rst:526 ../../virtual_machines.rst:637
@@ -836,8 +793,7 @@
#: ../../virtual_machines.rst:528
msgid ""
-"To delete a snapshot or restore a VM to the state saved in a particular "
-"snapshot:"
+"To delete a snapshot or restore a VM to the state saved in a particular snapshot:"
msgstr ""
#: ../../virtual_machines.rst:531
@@ -849,8 +805,7 @@
msgstr ""
#: ../../virtual_machines.rst:535
-msgid ""
-"In the list of snapshots, click the name of the snapshot you want to work with."
+msgid "In the list of snapshots, click the name of the snapshot you want to work with."
msgstr ""
#: ../../virtual_machines.rst:538
@@ -867,8 +822,8 @@
#: ../../virtual_machines.rst:545
msgid ""
-"VM snapshots are deleted automatically when a VM is destroyed. You don't have "
-"to manually delete the snapshots in this case."
+"VM snapshots are deleted automatically when a VM is destroyed. You don't have to "
+"manually delete the snapshots in this case."
msgstr ""
#: ../../virtual_machines.rst:550
@@ -877,8 +832,8 @@
#: ../../virtual_machines.rst:552
msgid ""
-"After a VM is created, you can modify the display name, operating system, and "
-"the group it belongs to."
+"After a VM is created, you can modify the display name, operating system, and the "
+"group it belongs to."
msgstr ""
#: ../../virtual_machines.rst:559 ../../virtual_machines.rst:622
@@ -905,8 +860,7 @@
#: ../../virtual_machines.rst:569
msgid ""
-"**Display name**: Enter a new display name if you want to change the name of "
-"the VM."
+"**Display name**: Enter a new display name if you want to change the name of the VM."
msgstr ""
#: ../../virtual_machines.rst:572
@@ -927,28 +881,27 @@
#: ../../virtual_machines.rst:582
msgid ""
-"Every guest VM has an internal name. The host uses the internal name to "
-"identify the guest VMs. CloudStack gives you an option to provide a guest VM "
-"with a display name. You can set this display name as the internal name so that "
-"the vCenter can use it to identify the guest VM. A new global parameter, vm."
-"instancename.flag, has now been added to achieve this functionality."
+"Every guest VM has an internal name. The host uses the internal name to identify the "
+"guest VMs. CloudStack gives you an option to provide a guest VM with a display name. "
+"You can set this display name as the internal name so that the vCenter can use it to "
+"identify the guest VM. A new global parameter, vm.instancename.flag, has now been "
+"added to achieve this functionality."
msgstr ""
#: ../../virtual_machines.rst:589
msgid ""
-"The default format of the internal name is i-<user\\_id>-<vm\\_id>-<instance."
-"name>, where instance.name is a global parameter. However, If vm.instancename."
-"flag is set to true, and if a display name is provided during the creation of a "
-"guest VM, the display name is appended to the internal name of the guest VM on "
-"the host. This makes the internal name format as i-<user\\_id>-<vm\\_id>-"
-"<displayName>. The default value of vm.instancename.flag is set to false. This "
-"feature is intended to make the correlation between instance names and internal "
-"names easier in large data center deployments."
+"The default format of the internal name is i-<user\\_id>-<vm\\_id>-<instance.name>, "
+"where instance.name is a global parameter. However, If vm.instancename.flag is set "
+"to true, and if a display name is provided during the creation of a guest VM, the "
+"display name is appended to the internal name of the guest VM on the host. This "
+"makes the internal name format as i-<user\\_id>-<vm\\_id>-<displayName>. The default "
+"value of vm.instancename.flag is set to false. This feature is intended to make the "
+"correlation between instance names and internal names easier in large data center "
+"deployments."
msgstr ""
#: ../../virtual_machines.rst:599
-msgid ""
-"The following table explains how a VM name is displayed in different scenarios."
+msgid "The following table explains how a VM name is displayed in different scenarios."
msgstr ""
#: ../../virtual_machines.rst:605
@@ -1020,8 +973,8 @@
#: ../../virtual_machines.rst:626
msgid ""
-"(Skip this step if you have enabled dynamic VM scaling; see :ref:`cpu-and-"
-"memory-scaling`.)"
+"(Skip this step if you have enabled dynamic VM scaling; see :ref:`cpu-and-memory-"
+"scaling`.)"
msgstr ""
#: ../../virtual_machines.rst:631
@@ -1042,10 +995,10 @@
#: ../../virtual_machines.rst:647
msgid ""
-"It is not always possible to accurately predict the CPU and RAM requirements "
-"when you first deploy a VM. You might need to increase these resources at any "
-"time during the life of a VM. You can dynamically modify CPU and RAM levels to "
-"scale up these resources for a running VM without incurring any downtime."
+"It is not always possible to accurately predict the CPU and RAM requirements when "
+"you first deploy a VM. You might need to increase these resources at any time during "
+"the life of a VM. You can dynamically modify CPU and RAM levels to scale up these "
+"resources for a running VM without incurring any downtime."
msgstr ""
#: ../../virtual_machines.rst:653
@@ -1066,16 +1019,16 @@
#: ../../virtual_machines.rst:662
msgid ""
-"The new requested CPU and RAM values must be within the constraints allowed by "
-"the hypervisor and the VM operating system."
+"The new requested CPU and RAM values must be within the constraints allowed by the "
+"hypervisor and the VM operating system."
msgstr ""
#: ../../virtual_machines.rst:665
msgid ""
"New VMs that are created after the installation of CloudStack 4.2 can use the "
-"dynamic scaling feature. If you are upgrading from a previous version of "
-"CloudStack, your existing VMs created with previous versions will not have the "
-"dynamic scaling capability unless you update them using the following procedure."
+"dynamic scaling feature. If you are upgrading from a previous version of CloudStack, "
+"your existing VMs created with previous versions will not have the dynamic scaling "
+"capability unless you update them using the following procedure."
msgstr ""
#: ../../virtual_machines.rst:673
@@ -1085,21 +1038,21 @@
#: ../../virtual_machines.rst:675
msgid ""
"If you are upgrading from a previous version of CloudStack, and you want your "
-"existing VMs created with previous versions to have the dynamic scaling "
-"capability, update the VMs using the following steps:"
+"existing VMs created with previous versions to have the dynamic scaling capability, "
+"update the VMs using the following steps:"
msgstr ""
#: ../../virtual_machines.rst:679
msgid ""
-"Make sure the zone-level setting enable.dynamic.scale.vm is set to true. In the "
-"left navigation bar of the CloudStack UI, click Infrastructure, then click "
-"Zones, click the zone you want, and click the Settings tab."
+"Make sure the zone-level setting enable.dynamic.scale.vm is set to true. In the left "
+"navigation bar of the CloudStack UI, click Infrastructure, then click Zones, click "
+"the zone you want, and click the Settings tab."
msgstr ""
#: ../../virtual_machines.rst:684
msgid ""
-"Install Xen tools (for XenServer hosts) or VMware Tools (for VMware hosts) on "
-"each VM if they are not already installed."
+"Install Xen tools (for XenServer hosts) or VMware Tools (for VMware hosts) on each "
+"VM if they are not already installed."
msgstr ""
#: ../../virtual_machines.rst:687
@@ -1129,8 +1082,8 @@
#: ../../virtual_machines.rst:704
msgid ""
-"enable.dynamic.scale.vm: Set to True to enable the feature. By default, the "
-"feature is turned off."
+"enable.dynamic.scale.vm: Set to True to enable the feature. By default, the feature "
+"is turned off."
msgstr ""
#: ../../virtual_machines.rst:707
@@ -1143,21 +1096,21 @@
#: ../../virtual_machines.rst:714
msgid ""
-"To modify the CPU and/or RAM capacity of a virtual machine, you need to change "
-"the compute offering of the VM to a new compute offering that has the desired "
-"CPU and RAM values. You can use the same steps described above in `“Changing "
-"the Service Offering for a VM” <#changing-the-service-offering-for-a-vm>`_, but "
-"skip the step where you stop the virtual machine. Of course, you might have to "
-"create a new compute offering first."
+"To modify the CPU and/or RAM capacity of a virtual machine, you need to change the "
+"compute offering of the VM to a new compute offering that has the desired CPU and "
+"RAM values. You can use the same steps described above in `“Changing the Service "
+"Offering for a VM” <#changing-the-service-offering-for-a-vm>`_, but skip the step "
+"where you stop the virtual machine. Of course, you might have to create a new "
+"compute offering first."
msgstr ""
#: ../../virtual_machines.rst:722
msgid ""
-"When you submit a dynamic scaling request, the resources will be scaled up on "
-"the current host if possible. If the host does not have enough resources, the "
-"VM will be live migrated to another host in the same cluster. If there is no "
-"host in the cluster that can fulfill the requested level of CPU and RAM, the "
-"scaling operation will fail. The VM will continue to run as it was before."
+"When you submit a dynamic scaling request, the resources will be scaled up on the "
+"current host if possible. If the host does not have enough resources, the VM will be "
+"live migrated to another host in the same cluster. If there is no host in the "
+"cluster that can fulfill the requested level of CPU and RAM, the scaling operation "
+"will fail. The VM will continue to run as it was before."
msgstr ""
#: ../../virtual_machines.rst:731
@@ -1170,35 +1123,33 @@
#: ../../virtual_machines.rst:735
msgid ""
-"CloudStack will not check to be sure that the new CPU and RAM levels are "
-"compatible with the OS running on the VM."
+"CloudStack will not check to be sure that the new CPU and RAM levels are compatible "
+"with the OS running on the VM."
msgstr ""
#: ../../virtual_machines.rst:738
msgid ""
-"When scaling memory or CPU for a Linux VM on VMware, you might need to run "
-"scripts in addition to the other steps mentioned above. For more information, "
-"see `Hot adding memory in Linux (1012764) <http://kb.vmware.com/selfservice/"
-"microsites/search.do?language=en_US&cmd=displayKC&externalId=1012764>`_ in the "
-"VMware Knowledge Base."
+"When scaling memory or CPU for a Linux VM on VMware, you might need to run scripts "
+"in addition to the other steps mentioned above. For more information, see `Hot "
+"adding memory in Linux (1012764) <http://kb.vmware.com/selfservice/microsites/search."
+"do?language=en_US&cmd=displayKC&externalId=1012764>`_ in the VMware Knowledge Base."
msgstr ""
#: ../../virtual_machines.rst:744
msgid ""
-"(VMware) If resources are not available on the current host, scaling up will "
-"fail on VMware because of a known issue where CloudStack and vCenter calculate "
-"the available capacity differently. For more information, see `https://issues."
-"apache.org/jira/browse/CLOUDSTACK-1809 <https://issues.apache.org/jira/browse/"
-"CLOUDSTACK-1809>`_."
+"(VMware) If resources are not available on the current host, scaling up will fail on "
+"VMware because of a known issue where CloudStack and vCenter calculate the available "
+"capacity differently. For more information, see `https://issues.apache.org/jira/"
+"browse/CLOUDSTACK-1809 <https://issues.apache.org/jira/browse/CLOUDSTACK-1809>`_."
msgstr ""
#: ../../virtual_machines.rst:750
msgid ""
-"On VMs running Linux 64-bit and Windows 7 32-bit operating systems, if the VM "
-"is initially assigned a RAM of less than 3 GB, it can be dynamically scaled up "
-"to 3 GB, but not more. This is due to a known issue with these operating "
-"systems, which will freeze if an attempt is made to dynamically scale from less "
-"than 3 GB to more than 3 GB."
+"On VMs running Linux 64-bit and Windows 7 32-bit operating systems, if the VM is "
+"initially assigned a RAM of less than 3 GB, it can be dynamically scaled up to 3 GB, "
+"but not more. This is due to a known issue with these operating systems, which will "
+"freeze if an attempt is made to dynamically scale from less than 3 GB to more than 3 "
+"GB."
msgstr ""
#: ../../virtual_machines.rst:758
@@ -1208,8 +1159,8 @@
#: ../../virtual_machines.rst:760
msgid ""
"For secure environments, and to ensure that VM state is not persisted across "
-"reboots, you can reset the root disk. For more information, see `“Reset VM to "
-"New Root Disk on Reboot” <storage.html#reset-vm-to-new-root-disk-on-reboot>`_."
+"reboots, you can reset the root disk. For more information, see `“Reset VM to New "
+"Root Disk on Reboot” <storage.html#reset-vm-to-new-root-disk-on-reboot>`_."
msgstr ""
#: ../../virtual_machines.rst:767
@@ -1218,15 +1169,15 @@
#: ../../virtual_machines.rst:769
msgid ""
-"The CloudStack administrator can move a running VM from one host to another "
-"without interrupting service to users or going into maintenance mode. This is "
-"called manual live migration, and can be done under the following conditions:"
+"The CloudStack administrator can move a running VM from one host to another without "
+"interrupting service to users or going into maintenance mode. This is called manual "
+"live migration, and can be done under the following conditions:"
msgstr ""
#: ../../virtual_machines.rst:774
msgid ""
-"The root administrator is logged in. Domain admins and users can not perform "
-"manual live migration of VMs."
+"The root administrator is logged in. Domain admins and users can not perform manual "
+"live migration of VMs."
msgstr ""
#: ../../virtual_machines.rst:777
@@ -1235,22 +1186,22 @@
#: ../../virtual_machines.rst:779
msgid ""
-"The destination host must have enough available capacity. If not, the VM will "
-"remain in the \"migrating\" state until memory becomes available."
+"The destination host must have enough available capacity. If not, the VM will remain "
+"in the \"migrating\" state until memory becomes available."
msgstr ""
#: ../../virtual_machines.rst:783
msgid ""
-"(KVM) The VM must not be using local disk storage. (On XenServer and VMware, VM "
-"live migration with local disk is enabled by CloudStack support for XenMotion "
-"and vMotion.)"
+"(KVM) The VM must not be using local disk storage. (On XenServer and VMware, VM live "
+"migration with local disk is enabled by CloudStack support for XenMotion and "
+"vMotion.)"
msgstr ""
#: ../../virtual_machines.rst:787
msgid ""
-"(KVM) The destination host must be in the same cluster as the original host. "
-"(On XenServer and VMware, VM live migration from one cluster to another is "
-"enabled by CloudStack support for XenMotion and vMotion.)"
+"(KVM) The destination host must be in the same cluster as the original host. (On "
+"XenServer and VMware, VM live migration from one cluster to another is enabled by "
+"CloudStack support for XenMotion and vMotion.)"
msgstr ""
#: ../../virtual_machines.rst:792
@@ -1267,14 +1218,13 @@
#: ../../virtual_machines.rst:802
msgid ""
-"From the list of suitable hosts, choose the one to which you want to move the "
-"VM."
+"From the list of suitable hosts, choose the one to which you want to move the VM."
msgstr ""
#: ../../virtual_machines.rst:806
msgid ""
-"If the VM's storage has to be migrated along with the VM, this will be noted in "
-"the host list. CloudStack will take care of the storage migration for you."
+"If the VM's storage has to be migrated along with the VM, this will be noted in the "
+"host list. CloudStack will take care of the storage migration for you."
msgstr ""
#: ../../virtual_machines.rst:814
@@ -1309,33 +1259,31 @@
#: ../../virtual_machines.rst:834
msgid ""
-"CloudStack supports ISOs and their attachment to guest VMs. An ISO is a read-"
-"only file that has an ISO/CD-ROM style file system. Users can upload their own "
-"ISOs and mount them on their guest VMs."
+"CloudStack supports ISOs and their attachment to guest VMs. An ISO is a read-only "
+"file that has an ISO/CD-ROM style file system. Users can upload their own ISOs and "
+"mount them on their guest VMs."
msgstr ""
#: ../../virtual_machines.rst:838
msgid ""
-"ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the ISO "
-"is available via HTTP specify an upload URL such as http://my.web.server/"
-"filename.iso."
+"ISOs are uploaded based on a URL. HTTP is the supported protocol. Once the ISO is "
+"available via HTTP specify an upload URL such as http://my.web.server/filename.iso."
msgstr ""
#: ../../virtual_machines.rst:842
msgid ""
-"ISOs may be public or private, like templates.ISOs are not hypervisor-specific. "
-"That is, a guest on vSphere can mount the exact same image that a guest on KVM "
-"can mount."
+"ISOs may be public or private, like templates.ISOs are not hypervisor-specific. That "
+"is, a guest on vSphere can mount the exact same image that a guest on KVM can mount."
msgstr ""
#: ../../virtual_machines.rst:846
msgid ""
"ISO images may be stored in the system and made available with a privacy level "
-"similar to templates. ISO images are classified as either bootable or not "
-"bootable. A bootable ISO image is one that contains an OS image. CloudStack "
-"allows a user to boot a guest VM off of an ISO image. Users can also attach ISO "
-"images to guest VMs. For example, this enables installing PV drivers into "
-"Windows. ISO images are not hypervisor-specific."
+"similar to templates. ISO images are classified as either bootable or not bootable. "
+"A bootable ISO image is one that contains an OS image. CloudStack allows a user to "
+"boot a guest VM off of an ISO image. Users can also attach ISO images to guest VMs. "
+"For example, this enables installing PV drivers into Windows. ISO images are not "
+"hypervisor-specific."
msgstr ""
#: ../../virtual_machines.rst:856
@@ -1344,10 +1292,10 @@
#: ../../virtual_machines.rst:858
msgid ""
-"To make additional operating system or other software available for use with "
-"guest VMs, you can add an ISO. The ISO is typically thought of as an operating "
-"system image, but you can also add ISOs for other types of software, such as "
-"desktop applications that you want to be installed as part of a template."
+"To make additional operating system or other software available for use with guest "
+"VMs, you can add an ISO. The ISO is typically thought of as an operating system "
+"image, but you can also add ISOs for other types of software, such as desktop "
+"applications that you want to be installed as part of a template."
msgstr ""
#: ../../virtual_machines.rst:864
@@ -1381,28 +1329,28 @@
#: ../../virtual_machines.rst:880
msgid ""
-"**URL**: The URL that hosts the ISO image. The Management Server must be able "
-"to access this location via HTTP. If needed you can place the ISO image "
-"directly on the Management Server"
+"**URL**: The URL that hosts the ISO image. The Management Server must be able to "
+"access this location via HTTP. If needed you can place the ISO image directly on the "
+"Management Server"
msgstr ""
#: ../../virtual_machines.rst:884
msgid ""
-"**Zone**: Choose the zone where you want the ISO to be available, or All Zones "
-"to make it available throughout CloudStack."
+"**Zone**: Choose the zone where you want the ISO to be available, or All Zones to "
+"make it available throughout CloudStack."
msgstr ""
#: ../../virtual_machines.rst:887
msgid ""
-"**Bootable**: Whether or not a guest could boot off this ISO image. For "
-"example, a CentOS ISO is bootable, a Microsoft Office ISO is not bootable."
+"**Bootable**: Whether or not a guest could boot off this ISO image. For example, a "
+"CentOS ISO is bootable, a Microsoft Office ISO is not bootable."
msgstr ""
#: ../../virtual_machines.rst:891
msgid ""
-"**OS Type**: This helps CloudStack and the hypervisor perform certain "
-"operations and make assumptions that improve the performance of the guest. "
-"Select one of the following."
+"**OS Type**: This helps CloudStack and the hypervisor perform certain operations and "
+"make assumptions that improve the performance of the guest. Select one of the "
+"following."
msgstr ""
#: ../../virtual_machines.rst:895
@@ -1411,21 +1359,20 @@
#: ../../virtual_machines.rst:898
msgid ""
-"If the OS Type of the ISO is not listed or if the ISO is not bootable, choose "
-"Other."
+"If the OS Type of the ISO is not listed or if the ISO is not bootable, choose Other."
msgstr ""
#: ../../virtual_machines.rst:901
msgid ""
-"(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV "
-"(32-bit) or Other PV (64-bit)"
+"(XenServer only) If you want to boot from this ISO in PV mode, choose Other PV (32-"
+"bit) or Other PV (64-bit)"
msgstr ""
#: ../../virtual_machines.rst:904
msgid ""
-"(KVM only) If you choose an OS that is PV-enabled, the VMs created from this "
-"ISO will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs "
-"will have an IDE root disk. The PV-enabled types are:"
+"(KVM only) If you choose an OS that is PV-enabled, the VMs created from this ISO "
+"will have a SCSI (virtio) root disk. If the OS is not PV-enabled, the VMs will have "
+"an IDE root disk. The PV-enabled types are:"
msgstr ""
#: ../../virtual_machines.rst:909
@@ -1486,9 +1433,9 @@
#: ../../virtual_machines.rst:938
msgid ""
-"It is not recommended to choose an older version of the OS than the version in "
-"the image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will "
-"usually not work. In these cases, choose Other."
+"It is not recommended to choose an older version of the OS than the version in the "
+"image. For example, choosing CentOS 5.4 to support a CentOS 6.2 image will usually "
+"not work. In these cases, choose Other."
msgstr ""
#: ../../virtual_machines.rst:943
@@ -1501,24 +1448,24 @@
#: ../../virtual_machines.rst:949
msgid ""
-"**Featured**: Choose Yes if you would like this ISO to be more prominent for "
-"users to select. The ISO will appear in the Featured ISOs list. Only an "
-"administrator can make an ISO Featured."
+"**Featured**: Choose Yes if you would like this ISO to be more prominent for users "
+"to select. The ISO will appear in the Featured ISOs list. Only an administrator can "
+"make an ISO Featured."
msgstr ""
#: ../../virtual_machines.rst:955
msgid ""
-"The Management Server will download the ISO. Depending on the size of the ISO, "
-"this may take a long time. The ISO status column will display Ready once it has "
-"been successfully downloaded into secondary storage. Clicking Refresh updates "
-"the download percentage."
+"The Management Server will download the ISO. Depending on the size of the ISO, this "
+"may take a long time. The ISO status column will display Ready once it has been "
+"successfully downloaded into secondary storage. Clicking Refresh updates the "
+"download percentage."
msgstr ""
#: ../../virtual_machines.rst:960
msgid ""
-"**Important**: Wait for the ISO to finish downloading. If you move on to the "
-"next task and try to use the ISO right away, it will appear to fail. The entire "
-"ISO must be available before CloudStack can work with it."
+"**Important**: Wait for the ISO to finish downloading. If you move on to the next "
+"task and try to use the ISO right away, it will appear to fail. The entire ISO must "
+"be available before CloudStack can work with it."
msgstr ""
#: ../../virtual_machines.rst:967
@@ -1543,43 +1490,43 @@
#: ../../virtual_machines.rst:983
msgid ""
-"Every VM is created from a base image, which is a template or ISO which has "
-"been created and stored in CloudStack. Both cloud administrators and end users "
-"can create and modify templates, ISOs, and VMs."
+"Every VM is created from a base image, which is a template or ISO which has been "
+"created and stored in CloudStack. Both cloud administrators and end users can create "
+"and modify templates, ISOs, and VMs."
msgstr ""
#: ../../virtual_machines.rst:987
msgid ""
"In CloudStack, you can change an existing VM's base image from one template to "
-"another, or from one ISO to another. (You can not change from an ISO to a "
-"template, or from a template to an ISO)."
+"another, or from one ISO to another. (You can not change from an ISO to a template, "
+"or from a template to an ISO)."
msgstr ""
#: ../../virtual_machines.rst:991
msgid ""
-"For example, suppose there is a template based on a particular operating "
-"system, and the OS vendor releases a software patch. The administrator or user "
-"naturally wants to apply the patch and then make sure existing VMs start using "
-"it. Whether a software update is involved or not, it's also possible to simply "
-"switch a VM from its current template to any other desired template."
+"For example, suppose there is a template based on a particular operating system, and "
+"the OS vendor releases a software patch. The administrator or user naturally wants "
+"to apply the patch and then make sure existing VMs start using it. Whether a "
+"software update is involved or not, it's also possible to simply switch a VM from "
+"its current template to any other desired template."
msgstr ""
#: ../../virtual_machines.rst:998
msgid ""
-"To change a VM's base image, call the restoreVirtualMachine API command and "
-"pass in the virtual machine ID and a new template ID. The template ID parameter "
-"may refer to either a template or an ISO, depending on which type of base image "
-"the VM was already using (it must match the previous type of image). When this "
-"call occurs, the VM's root disk is first destroyed, then a new root disk is "
-"created from the source designated in the template ID parameter. The new root "
-"disk is attached to the VM, and now the VM is based on the new template."
+"To change a VM's base image, call the restoreVirtualMachine API command and pass in "
+"the virtual machine ID and a new template ID. The template ID parameter may refer to "
+"either a template or an ISO, depending on which type of base image the VM was "
+"already using (it must match the previous type of image). When this call occurs, the "
+"VM's root disk is first destroyed, then a new root disk is created from the source "
+"designated in the template ID parameter. The new root disk is attached to the VM, "
+"and now the VM is based on the new template."
msgstr ""
#: ../../virtual_machines.rst:1007
msgid ""
-"You can also omit the template ID parameter from the restoreVirtualMachine "
-"call. In this case, the VM's root disk is destroyed and recreated, but from the "
-"same template or ISO that was already in use by the VM."
+"You can also omit the template ID parameter from the restoreVirtualMachine call. In "
+"this case, the VM's root disk is destroyed and recreated, but from the same template "
+"or ISO that was already in use by the VM."
msgstr ""
#: ../../virtual_machines.rst:1014
@@ -1588,16 +1535,16 @@
#: ../../virtual_machines.rst:1016
msgid ""
-"In addition to the username and password authentication, CloudStack supports "
-"using SSH keys to log in to the cloud infrastructure for additional security. "
-"You can use the createSSHKeyPair API to generate the SSH keys."
+"In addition to the username and password authentication, CloudStack supports using "
+"SSH keys to log in to the cloud infrastructure for additional security. You can use "
+"the createSSHKeyPair API to generate the SSH keys."
msgstr ""
#: ../../virtual_machines.rst:1021
msgid ""
"Because each cloud user has their own SSH key, one cloud user cannot log in to "
-"another cloud user's instances unless they share their SSH key files. Using a "
-"single SSH key pair, you can manage multiple instances."
+"another cloud user's instances unless they share their SSH key files. Using a single "
+"SSH key pair, you can manage multiple instances."
msgstr ""
#: ../../virtual_machines.rst:1027
@@ -1619,9 +1566,9 @@
#: ../../virtual_machines.rst:1035
#, python-format
msgid ""
-"Download the cloudstack script from `The SSH Key Gen Script <http://sourceforge."
-"net/projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`_ to the instance you "
-"have created."
+"Download the cloudstack script from `The SSH Key Gen Script <http://sourceforge.net/"
+"projects/cloudstack/files/SSH%20Key%20Gen%20Script/>`_ to the instance you have "
+"created."
msgstr ""
#: ../../virtual_machines.rst:1043
@@ -1653,15 +1600,15 @@
#: ../../virtual_machines.rst:1071
msgid ""
-"For example, make a call from the cloudstack server to create a SSH keypair "
-"called \"keypair-doc\" for the admin account in the root domain:"
+"For example, make a call from the cloudstack server to create a SSH keypair called "
+"\"keypair-doc\" for the admin account in the root domain:"
msgstr ""
#: ../../virtual_machines.rst:1075
msgid ""
-"Ensure that you adjust these values to meet your needs. If you are making the "
-"API call from a different server, your URL/PORT will be different, and you will "
-"need to use the API keys."
+"Ensure that you adjust these values to meet your needs. If you are making the API "
+"call from a different server, your URL/PORT will be different, and you will need to "
+"use the API keys."
msgstr ""
#: ../../virtual_machines.rst:1079
@@ -1687,10 +1634,10 @@
#: ../../virtual_machines.rst:1126
msgid ""
"After you save the SSH keypair file, you must create an instance by using the "
-"template that you created at `Section 5.2.1, “ Creating an Instance Template "
-"that Supports SSH Keys” <#create-ssh-template>`__. Ensure that you use the same "
-"SSH key name that you created at `Section 5.2.2, “Creating the SSH Keypair” "
-"<#create-ssh-keypair>`__."
+"template that you created at `Section 5.2.1, “ Creating an Instance Template that "
+"Supports SSH Keys” <#create-ssh-template>`__. Ensure that you use the same SSH key "
+"name that you created at `Section 5.2.2, “Creating the SSH Keypair” <#create-ssh-"
+"keypair>`__."
msgstr ""
#: ../../virtual_machines.rst:1133
@@ -1705,8 +1652,8 @@
#: ../../virtual_machines.rst:1142
msgid ""
-"Substitute the template, service offering and security group IDs (if you are "
-"using the security group feature) that are in your cloud environment."
+"Substitute the template, service offering and security group IDs (if you are using "
+"the security group feature) that are in your cloud environment."
msgstr ""
#: ../../virtual_machines.rst:1148
@@ -1715,8 +1662,8 @@
#: ../../virtual_machines.rst:1150
msgid ""
-"To test your SSH key generation is successful, check whether you can log in to "
-"the cloud setup."
+"To test your SSH key generation is successful, check whether you can log in to the "
+"cloud setup."
msgstr ""
#: ../../virtual_machines.rst:1153
@@ -1725,8 +1672,7 @@
#: ../../virtual_machines.rst:1159
msgid ""
-"The -i parameter tells the ssh client to use a ssh key found at ~/.ssh/keypair-"
-"doc."
+"The -i parameter tells the ssh client to use a ssh key found at ~/.ssh/keypair-doc."
msgstr ""
#: ../../virtual_machines.rst:1164
@@ -1735,10 +1681,10 @@
#: ../../virtual_machines.rst:1166
msgid ""
-"With the API command resetSSHKeyForVirtualMachine, a user can set or reset the "
-"SSH keypair assigned to a virtual machine. A lost or compromised SSH keypair "
-"can be changed, and the user can access the VM by using the new keypair. Just "
-"create or register a new keypair, then call resetSSHKeyForVirtualMachine."
+"With the API command resetSSHKeyForVirtualMachine, a user can set or reset the SSH "
+"keypair assigned to a virtual machine. A lost or compromised SSH keypair can be "
+"changed, and the user can access the VM by using the new keypair. Just create or "
+"register a new keypair, then call resetSSHKeyForVirtualMachine."
msgstr ""
#: ../../virtual_machines/user-data.rst:18
@@ -1747,37 +1693,37 @@
#: ../../virtual_machines/user-data.rst:20
msgid ""
-"CloudStack provides API access to attach up to 2KB of data after base64 "
-"encoding to a deployed VM. Using HTTP POST(via POST body), you can send up to "
-"32K of data after base64 encoding. Deployed VMs also have access to instance "
-"metadata via the virtual router."
+"CloudStack provides API access to attach up to 2KB of data after base64 encoding to "
+"a deployed VM. Using HTTP POST(via POST body), you can send up to 32K of data after "
+"base64 encoding. Deployed VMs also have access to instance metadata via the virtual "
+"router."
msgstr ""
-"CloudStack fournit un accès à une API pour attacher plus de 2KB de données "
-"après encodage en base64 à une VM déployée. En utilisant une requête POST HTTP "
-"(via POST body), vous pouvez envoyer jusqu'à 32K de données après encodage en "
-"base64. Les VM déployées ont ainsi accès aux méta-données d'instance via le "
-"routeur virtuel."
+"CloudStack fournit un accès à une API pour attacher plus de 2KB de données après "
+"encodage en base64 à une VM déployée. En utilisant une requête POST HTTP (via "
+"POST body), vous pouvez envoyer jusqu'à 32K de données après encodage en base64. "
+"Les VM déployées ont ainsi accès aux méta-données d'instance via le routeur "
+"virtuel."
#: ../../virtual_machines/user-data.rst:25
msgid ""
-"Create virtual machine thru the API: `deployVirtualMachine <http://cloudstack."
-"apache.org/docs/api/apidocs-4.5/user/deployVirtualMachine.html>`_ using the "
-"parameter ``userdata=`` to include user-data formated in `base64 <https://www."
-"base64encode.org/>`_."
+"Create virtual machine thru the API: `deployVirtualMachine <http://cloudstack.apache."
+"org/docs/api/apidocs-4.5/user/deployVirtualMachine.html>`_ using the parameter "
+"``userdata=`` to include user-data formated in `base64 <https://www.base64encode.org/"
+">`_."
msgstr ""
-"Créer une machine virtuelle via l'API : `deployVirtualMachine <http://"
-"cloudstack.apache.org/docs/api/apidocs-4.5/user/deployVirtualMachine.html>`_ en "
-"utilisant le paramètre ``userdata=`` pour inclure les données utilisateurs "
-"formatées en `base64 <https://www.base64encode.org/>`_."
+"Créer une machine virtuelle via l'API : `deployVirtualMachine <http://cloudstack."
+"apache.org/docs/api/apidocs-4.5/user/deployVirtualMachine.html>`_ en utilisant le "
+"paramètre ``userdata=`` pour inclure les données utilisateurs formatées en "
+"`base64 <https://www.base64encode.org/>`_."
#: ../../virtual_machines/user-data.rst:29
msgid ""
-"Accessed user-data from VM. Once the IP address of the virtual router is known, "
-"use the following steps to retrieve user-data:"
+"Accessed user-data from VM. Once the IP address of the virtual router is known, use "
+"the following steps to retrieve user-data:"
msgstr ""
-"Accéder aux données utilisateur depuis la VM. Une ois que l'adresse IP du "
-"routeur virtuel est connue, utiliser les étapes suivantes pour récupérer les "
-"méta-données :"
+"Accéder aux données utilisateur depuis la VM. Une ois que l'adresse IP du routeur "
+"virtuel est connue, utiliser les étapes suivantes pour récupérer les méta-"
+"données :"
#: ../../virtual_machines/user-data.rst:32
msgid "Run the following command to find the virtual router."
@@ -1794,15 +1740,14 @@
#: ../../virtual_machines/user-data.rst:45
msgid ""
"Meta Data can be accessed similarly, using a URL of the form ``http://10.1.1.1/"
-"latest/meta-data/{metadata type}``. (For backwards compatibility, the previous "
-"URL ``http://10.1.1.1/latest/{metadata type}`` is also supported.) For metadata "
-"type, use one of the following:"
+"latest/meta-data/{metadata type}``. (For backwards compatibility, the previous URL "
+"``http://10.1.1.1/latest/{metadata type}`` is also supported.) For metadata type, "
+"use one of the following:"
msgstr ""
"Les méta-données peuvent être accédées de manière similaire, utilisant une URL "
-"de la forme ``http://10.1.1.1/latest/meta-data/{metadata type}``. (Pour des "
-"raisons de compatibilités ascendantes, les anciennes URL ``http://10.1.1.1/"
-"latest/{metadata type}`` sont aussi supportées.) Pour le type de méta-données, "
-"utiliser au choix :"
+"de la forme ``http://10.1.1.1/latest/meta-data/{metadata type}``. (Pour des raisons "
+"de compatibilités ascendantes, les anciennes URL ``http://10.1.1.1/latest/{metadata "
+"type}`` sont aussi supportées.) Pour le type de méta-données, utiliser au choix :"
#: ../../virtual_machines/user-data.rst:50
msgid "``service-offering``. A description of the VMs service offering"
@@ -1841,20 +1786,20 @@
#: ../../virtual_machines/user-data.rst:69
msgid ""
-"`Cloud-Init <https://cloudinit.readthedocs.org/en/latest>`_ can be use to "
-"access an interpret user-data from virtual machines. Cloud-Init be installed "
-"into templates and also require CloudStack password and sshkey scripts (:ref:"
-"`adding-password-management-to-templates` and `using ssh keys <virtual_machines."
-"html#using-ssh-keys-for-authentication>`_). User password management and "
+"`Cloud-Init <https://cloudinit.readthedocs.org/en/latest>`_ can be use to access an "
+"interpret user-data from virtual machines. Cloud-Init be installed into templates "
+"and also require CloudStack password and sshkey scripts (:ref:`adding-password-"
+"management-to-templates` and `using ssh keys <virtual_machines.html#using-ssh-keys-"
+"for-authentication>`_). User password management and "
"``resetSSHKeyForVirtualMachine`` API are not yet supported by cloud-init."
msgstr ""
-"`Cloud-Init <https://cloudinit.readthedocs.org/en/latest>`_ peut être utiliser "
-"pour accéder aux données utilisateurs depuis les machines virtuelles. Cloud-"
-"init peut être installé dans les modèles et néssite aussi les scripts "
-"CloudStack password et sshkey (:ref:`adding-password-management-to-templates` "
-"et `utiliser les clefs ssh <virtual_machines.html#using-ssh-keys-for-"
-"authentication>`_). La gestion du mot de passe utilisateur et l'API "
-"``resetSSHKeyForVirtualMachine`` ne sont pas encore supportés par cloud-init."
+"`Cloud-Init <https://cloudinit.readthedocs.org/en/latest>`_ peut être utiliser pour "
+"accéder aux données utilisateurs depuis les machines virtuelles. Cloud-init peut "
+"être installé dans les modèles et néssite aussi les scripts CloudStack password "
+"et sshkey (:ref:`adding-password-management-to-templates` et `utiliser les clefs ssh "
+"<virtual_machines.html#using-ssh-keys-for-authentication>`_). La gestion du mot de "
+"passe utilisateur et l'API ``resetSSHKeyForVirtualMachine`` ne sont pas encore "
+"supportés par cloud-init."
#: ../../virtual_machines/user-data.rst:74
msgid "Install cloud-init package into a template:"
@@ -1862,8 +1807,7 @@
#: ../../virtual_machines/user-data.rst:82
msgid ""
-"Create datasource configuration file: ``/etc/cloud/cloud.cfg.d/99_cloudstack."
-"cfg``"
+"Create datasource configuration file: ``/etc/cloud/cloud.cfg.d/99_cloudstack.cfg``"
msgstr ""
"Créer un fichier de configuration de source de données : ``/etc/cloud/cloud.cfg."
"d/99_cloudstack.cfg``"
@@ -1876,8 +1820,8 @@
msgid ""
"This example use cloud-init to Upgrade Operating-System of the newly created VM:"
msgstr ""
-"Cet exemple utilise cloud-init pour mettre à jour le système d'exploitation "
-"d'une VM nouvellement crée :"
+"Cet exemple utilise cloud-init pour mettre à jour le système d'exploitation d'une "
+"VM nouvellement crée :"
#: ../../virtual_machines/user-data.rst:110
msgid "base64 formated:"
@@ -1886,14 +1830,14 @@
#: ../../virtual_machines/user-data.rst:116
msgid ""
"Refer to `Cloud-Init CloudStack datasource <http://cloudinit.readthedocs.org/en/"
-"latest/topics/datasources.html#cloudstack>`_ documentation for latest "
-"capabilities. Cloud-Init and Cloud-Init CloudStack datasource are not supported "
-"by Apache CloudStack community."
+"latest/topics/datasources.html#cloudstack>`_ documentation for latest capabilities. "
+"Cloud-Init and Cloud-Init CloudStack datasource are not supported by Apache "
+"CloudStack community."
msgstr ""
-"Se référer à la documentation `Cloud-Init CloudStack datasource <http://"
-"cloudinit.readthedocs.org/en/latest/topics/datasources.html#cloudstack>`_ pour "
-"les dernières possibilitées. Cloud-Init et source de données Cloud-Init "
-"CloudStack ne sont pas supportées par la communauté Apache CloudStack."
+"Se référer à la documentation `Cloud-Init CloudStack datasource <http://cloudinit."
+"readthedocs.org/en/latest/topics/datasources.html#cloudstack>`_ pour les dernières "
+"possibilitées. Cloud-Init et source de données Cloud-Init CloudStack ne sont pas "
+"supportées par la communauté Apache CloudStack."
#: ../../virtual_machines.rst:1176
msgid "Assigning GPU/vGPU to Guest VMs"
@@ -1902,48 +1846,45 @@
#: ../../virtual_machines.rst:1178
msgid ""
"CloudStack can deploy guest VMs with Graphics Processing Unit (GPU) or Virtual "
-"Graphics Processing Unit (vGPU) capabilities on XenServer hosts. At the time of "
-"VM deployment or at a later stage, you can assign a physical GPU ( known as GPU-"
-"passthrough) or a portion of a physical GPU card (vGPU) to a guest VM by "
-"changing the Service Offering. With this capability, the VMs running on "
-"CloudStack meet the intensive graphical processing requirement by means of the "
-"high computation power of GPU/vGPU, and CloudStack users can run multimedia "
-"rich applications, such as Auto-CAD, that they otherwise enjoy at their desk on "
-"a virtualized environment. CloudStack leverages the XenServer support for "
-"NVIDIA GRID Kepler 1 and 2 series to run GPU/vGPU enabled VMs. NVIDIA GRID "
-"cards allows sharing a single GPU cards among multiple VMs by creating vGPUs "
-"for each VM. With vGPU technology, the graphics commands from each VM are "
-"passed directly to the underlying dedicated GPU, without the intervention of "
-"the hypervisor. This allows the GPU hardware to be time-sliced and shared "
-"across multiple VMs. XenServer hosts use the GPU cards in following ways:"
+"Graphics Processing Unit (vGPU) capabilities on XenServer hosts. At the time of VM "
+"deployment or at a later stage, you can assign a physical GPU ( known as GPU-"
+"passthrough) or a portion of a physical GPU card (vGPU) to a guest VM by changing "
+"the Service Offering. With this capability, the VMs running on CloudStack meet the "
+"intensive graphical processing requirement by means of the high computation power of "
+"GPU/vGPU, and CloudStack users can run multimedia rich applications, such as Auto-"
+"CAD, that they otherwise enjoy at their desk on a virtualized environment. "
+"CloudStack leverages the XenServer support for NVIDIA GRID Kepler 1 and 2 series to "
+"run GPU/vGPU enabled VMs. NVIDIA GRID cards allows sharing a single GPU cards among "
+"multiple VMs by creating vGPUs for each VM. With vGPU technology, the graphics "
+"commands from each VM are passed directly to the underlying dedicated GPU, without "
+"the intervention of the hypervisor. This allows the GPU hardware to be time-sliced "
+"and shared across multiple VMs. XenServer hosts use the GPU cards in following ways:"
msgstr ""
#: ../../virtual_machines.rst:1195
msgid ""
-"**GPU passthrough**: GPU passthrough represents a physical GPU which can be "
-"directly assigned to a VM. GPU passthrough can be used on a hypervisor "
-"alongside GRID vGPU, with some restrictions: A GRID physical GPU can either "
-"host GRID vGPUs or be used as passthrough, but not both at the same time."
+"**GPU passthrough**: GPU passthrough represents a physical GPU which can be directly "
+"assigned to a VM. GPU passthrough can be used on a hypervisor alongside GRID vGPU, "
+"with some restrictions: A GRID physical GPU can either host GRID vGPUs or be used as "
+"passthrough, but not both at the same time."
msgstr ""
#: ../../virtual_machines.rst:1200
msgid ""
-"**GRID vGPU**: GRID vGPU enables multiple VMs to share a single physical GPU. "
-"The VMs run an NVIDIA driver stack and get direct access to the GPU. GRID "
-"physical GPUs are capable of supporting multiple virtual GPU devices (vGPUs) "
-"that can be assigned directly to guest VMs. Guest VMs use GRID virtual GPUs in "
-"the same manner as a physical GPU that has been passed through by the "
-"hypervisor: an NVIDIA driver loaded in the guest VM provides direct access to "
-"the GPU for performance-critical fast paths, and a paravirtualized interface to "
-"the GRID Virtual GPU Manager, which is used for nonperformant management "
-"operations. NVIDIA GRID Virtual GPU Manager for XenServer runs in dom0. "
-"CloudStack provides you with the following capabilities:"
+"**GRID vGPU**: GRID vGPU enables multiple VMs to share a single physical GPU. The "
+"VMs run an NVIDIA driver stack and get direct access to the GPU. GRID physical GPUs "
+"are capable of supporting multiple virtual GPU devices (vGPUs) that can be assigned "
+"directly to guest VMs. Guest VMs use GRID virtual GPUs in the same manner as a "
+"physical GPU that has been passed through by the hypervisor: an NVIDIA driver loaded "
+"in the guest VM provides direct access to the GPU for performance-critical fast "
+"paths, and a paravirtualized interface to the GRID Virtual GPU Manager, which is "
+"used for nonperformant management operations. NVIDIA GRID Virtual GPU Manager for "
+"XenServer runs in dom0. CloudStack provides you with the following capabilities:"
msgstr ""
#: ../../virtual_machines.rst:1211
msgid ""
-"Adding XenServer hosts with GPU/vGPU capability provisioned by the "
-"administrator."
+"Adding XenServer hosts with GPU/vGPU capability provisioned by the administrator."
msgstr ""
#: ../../virtual_machines.rst:1213
@@ -1974,8 +1915,8 @@
#: ../../virtual_machines.rst:1226
msgid ""
-"Querying hosts to obtain information about the GPU cards, supported vGPU types "
-"in case of GRID cards, and capacity of the cards."
+"Querying hosts to obtain information about the GPU cards, supported vGPU types in "
+"case of GRID cards, and capacity of the cards."
msgstr ""
#: ../../virtual_machines.rst:1230
@@ -1988,15 +1929,15 @@
#: ../../virtual_machines.rst:1234
msgid ""
-"The vGPU-enabled XenServer 6.2 and later versions. For more information, see "
-"`Citrix 3D Graphics Pack <https://www.citrix.com/go/private/vgpu.html>`_."
+"The vGPU-enabled XenServer 6.2 and later versions. For more information, see `Citrix "
+"3D Graphics Pack <https://www.citrix.com/go/private/vgpu.html>`_."
msgstr ""
#: ../../virtual_machines.rst:1237
msgid ""
-"GPU/vPGU functionality is supported for following HVM guest operating systems: "
-"For more information, see `Citrix 3D Graphics Pack <https://www.citrix.com/go/"
-"private/vgpu.html>`_."
+"GPU/vPGU functionality is supported for following HVM guest operating systems: For "
+"more information, see `Citrix 3D Graphics Pack <https://www.citrix.com/go/private/"
+"vgpu.html>`_."
msgstr ""
#: ../../virtual_machines.rst:1240
@@ -2025,43 +1966,42 @@
#: ../../virtual_machines.rst:1252
msgid ""
-"CloudStack does not restrict the deployment of GPU-enabled VMs with guest OS "
-"types that are not supported by XenServer for GPU/vGPU functionality. The "
-"deployment would be successful and a GPU/vGPU will also get allocated for VMs; "
-"however, due to missing guest OS drivers, VM would not be able to leverage GPU "
-"resources. Therefore, it is recommended to use GPU-enabled service offering "
-"only with supported guest OS."
+"CloudStack does not restrict the deployment of GPU-enabled VMs with guest OS types "
+"that are not supported by XenServer for GPU/vGPU functionality. The deployment would "
+"be successful and a GPU/vGPU will also get allocated for VMs; however, due to "
+"missing guest OS drivers, VM would not be able to leverage GPU resources. Therefore, "
+"it is recommended to use GPU-enabled service offering only with supported guest OS."
msgstr ""
#: ../../virtual_machines.rst:1254
msgid ""
"NVIDIA GRID K1 (16 GiB video RAM) AND K2 (8 GiB of video RAM) cards supports "
-"homogeneous virtual GPUs, implies that at any given time, the vGPUs resident on "
-"a single physical GPU must be all of the same type. However, this restriction "
-"doesn't extend across physical GPUs on the same card. Each physical GPU on a K1 "
-"or K2 may host different types of virtual GPU at the same time. For example, a "
-"GRID K2 card has two physical GPUs, and supports four types of virtual GPU; "
-"GRID K200, GRID K220Q, GRID K240Q, AND GRID K260Q."
+"homogeneous virtual GPUs, implies that at any given time, the vGPUs resident on a "
+"single physical GPU must be all of the same type. However, this restriction doesn't "
+"extend across physical GPUs on the same card. Each physical GPU on a K1 or K2 may "
+"host different types of virtual GPU at the same time. For example, a GRID K2 card "
+"has two physical GPUs, and supports four types of virtual GPU; GRID K200, GRID "
+"K220Q, GRID K240Q, AND GRID K260Q."
msgstr ""
#: ../../virtual_machines.rst:1256
msgid ""
-"NVIDIA driver must be installed to enable vGPU operation as for a physical "
-"NVIDIA GPU."
+"NVIDIA driver must be installed to enable vGPU operation as for a physical NVIDIA "
+"GPU."
msgstr ""
#: ../../virtual_machines.rst:1258
msgid ""
-"XenServer tools are installed in the VM to get maximum performance on "
-"XenServer, regardless of type of vGPU you are using. Without the optimized "
-"networking and storage drivers that the XenServer tools provide, remote "
-"graphics applications running on GRID vGPU will not deliver maximum performance."
+"XenServer tools are installed in the VM to get maximum performance on XenServer, "
+"regardless of type of vGPU you are using. Without the optimized networking and "
+"storage drivers that the XenServer tools provide, remote graphics applications "
+"running on GRID vGPU will not deliver maximum performance."
msgstr ""
#: ../../virtual_machines.rst:1260
msgid ""
-"To deliver high frames from multiple heads on vGPU, install XenDesktop with HDX "
-"3D Pro remote graphics."
+"To deliver high frames from multiple heads on vGPU, install XenDesktop with HDX 3D "
+"Pro remote graphics."
msgstr ""
#: ../../virtual_machines.rst:1262
@@ -2070,22 +2010,22 @@
#: ../../virtual_machines.rst:1264
msgid ""
-"Deploying VMs GPU/vGPU capability is not supported if hosts are not available "
-"with enough GPU capacity."
+"Deploying VMs GPU/vGPU capability is not supported if hosts are not available with "
+"enough GPU capacity."
msgstr ""
#: ../../virtual_machines.rst:1266
msgid ""
-"A Service Offering cannot be created with the GPU values that are not supported "
-"by CloudStack UI. However, you can make an API call to achieve this."
+"A Service Offering cannot be created with the GPU values that are not supported by "
+"CloudStack UI. However, you can make an API call to achieve this."
msgstr ""
#: ../../virtual_machines.rst:1268
msgid ""
-"Dynamic scaling is not supported. However, you can choose to deploy a VM "
-"without GPU support, and at a later point, you can change the system offering "
-"to upgrade to the one with vGPU. You can achieve this by offline upgrade: stop "
-"the VM, upgrade the Service Offering to the one with vGPU, then start the VM."
+"Dynamic scaling is not supported. However, you can choose to deploy a VM without GPU "
+"support, and at a later point, you can change the system offering to upgrade to the "
+"one with vGPU. You can achieve this by offline upgrade: stop the VM, upgrade the "
+"Service Offering to the one with vGPU, then start the VM."
msgstr ""
#: ../../virtual_machines.rst:1270
@@ -2170,27 +2110,27 @@
#: ../../virtual_machines.rst:1302
msgid ""
-"CloudStack follows the below sequence of operations to provide GPU/vGPU support "
-"for VMs:"
+"CloudStack follows the below sequence of operations to provide GPU/vGPU support for "
+"VMs:"
msgstr ""
#: ../../virtual_machines.rst:1304
msgid ""
"Ensure that XenServer host is ready with GPU installed and configured. For more "
-"information, see `Citrix 3D Graphics Pack <https://www.citrix.com/go/private/"
-"vgpu.html>`_."
+"information, see `Citrix 3D Graphics Pack <https://www.citrix.com/go/private/vgpu."
+"html>`_."
msgstr ""
#: ../../virtual_machines.rst:1307
msgid ""
-"Add the host to CloudStack. CloudStack checks if the host is GPU-enabled or "
-"not. CloudStack queries the host and detect if it's GPU enabled."
+"Add the host to CloudStack. CloudStack checks if the host is GPU-enabled or not. "
+"CloudStack queries the host and detect if it's GPU enabled."
msgstr ""
#: ../../virtual_machines.rst:1310
msgid ""
-"Create a compute offering with GPU/vGPU support: For more information, see "
-"`Creating a New Compute Offering <#creating-a-new-compute-offering>`__.."
+"Create a compute offering with GPU/vGPU support: For more information, see `Creating "
+"a New Compute Offering <#creating-a-new-compute-offering>`__.."
msgstr ""
#: ../../virtual_machines.rst:1313
@@ -2204,8 +2144,7 @@
#: ../../virtual_machines.rst:1317
msgid ""
"Deploy a VM with GPU/vGPU support by selecting appropriate Service Offering. "
-"CloudStack decide which host to choose for VM deployment based on following "
-"criteria:"
+"CloudStack decide which host to choose for VM deployment based on following criteria:"
msgstr ""
#: ../../virtual_machines.rst:1319
@@ -2218,11 +2157,11 @@
#: ../../virtual_machines.rst:1321
msgid ""
"Alternately, you can choose to deploy a VM without GPU support, and at a later "
-"point, you can change the system offering. You can achieve this by offline "
-"upgrade: stop the VM, upgrade the Service Offering to the one with vGPU, then "
-"start the VM. In this case, CloudStack gets a list of hosts which have enough "
-"capacity to host the VM. If there is a GPU-enabled host, CloudStack reorders "
-"this host list and place the GPU-enabled hosts at the bottom of the list."
+"point, you can change the system offering. You can achieve this by offline upgrade: "
+"stop the VM, upgrade the Service Offering to the one with vGPU, then start the VM. "
+"In this case, CloudStack gets a list of hosts which have enough capacity to host the "
+"VM. If there is a GPU-enabled host, CloudStack reorders this host list and place the "
+"GPU-enabled hosts at the bottom of the list."
msgstr ""
#: ../../virtual_machines.rst:1324
@@ -2233,8 +2172,8 @@
msgid ""
"CloudStack searches for hosts available for VM migration, which satisfies GPU "
"requirement. If the host is available, stop the VM in the current host and "
-"perform the VM migration task. If the VM migration is successful, the remaining "
-"GPU capacity is updated for both the hosts accordingly."
+"perform the VM migration task. If the VM migration is successful, the remaining GPU "
+"capacity is updated for both the hosts accordingly."
msgstr ""
#: ../../virtual_machines.rst:1328
@@ -2243,7 +2182,7 @@
#: ../../virtual_machines.rst:1330
msgid ""
-"GPU resources are released automatically when you stop a VM. Once the destroy "
-"VM is successful, CloudStack will make a resource call to the host to get the "
-"remaining GPU capacity in the card and update the database accordingly."
+"GPU resources are released automatically when you stop a VM. Once the destroy VM is "
+"successful, CloudStack will make a resource call to the host to get the remaining "
+"GPU capacity in the card and update the database accordingly."
msgstr ""
diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.mo b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.mo
deleted file mode 100644
index 3b2f8c1..0000000
--- a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.mo
+++ /dev/null
Binary files differ
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 b45849e..1fca365 100644
--- a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
+++ b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.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 ""
