Merge branch 'master' of https://github.com/lmrv/cloudstack-docs-admin
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/dce470ef Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/dce470ef Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/dce470ef Branch: refs/heads/master Commit: dce470ef24d098d779e65729d56bcd4c5fc784d6 Parents: a6b15cb 90ae7fb Author: Antoine Le Morvan <anto...@le-morvan.com> Authored: Sat Jan 7 10:00:48 2017 +0100 Committer: Antoine Le Morvan <anto...@le-morvan.com> Committed: Sat Jan 7 10:00:48 2017 +0100 ---------------------------------------------------------------------- source/locale/fr/LC_MESSAGES/_global.po | 10 ++++++++++ source/locale/fr/LC_MESSAGES/accounts.po | 9 +++++++++ source/locale/fr/LC_MESSAGES/administration.po | 8 ++++++++ source/locale/fr/LC_MESSAGES/api.po | 8 ++++++++ source/locale/fr/LC_MESSAGES/events.po | 9 +++++++++ source/locale/fr/LC_MESSAGES/hosts.po | 9 +++++++++ source/locale/fr/LC_MESSAGES/index.po | 7 +++++++ source/locale/fr/LC_MESSAGES/management.po | 6 ++++++ source/locale/fr/LC_MESSAGES/networking.po | 6 ++++++ .../networking/acquiring_an_ip_address.po | 6 ++++++ .../networking/advanced_zone_config.po | 6 ++++++ .../LC_MESSAGES/networking/basic_zone_config.po | 6 ++++++ .../fr/LC_MESSAGES/networking/dns_and_dhcp.po | 6 ++++++ .../fr/LC_MESSAGES/networking/elastic_ips.po | 6 ++++++ .../external_firewalls_and_load_balancers.po | 6 ++++++ .../networking/global_server_load_balancing.po | 6 ++++++ .../fr/LC_MESSAGES/networking/guest_ip_ranges.po | 6 ++++++ .../fr/LC_MESSAGES/networking/guest_traffic.po | 6 ++++++ .../LC_MESSAGES/networking/inter_vlan_routing.po | 6 ++++++ .../networking/ip_forwarding_and_firewalling.po | 6 ++++++ .../LC_MESSAGES/networking/ip_load_balancing.po | 6 ++++++ .../ip_reservation_in_guest_networks.po | 6 ++++++ .../isolation_in_advanced_zone_with_vlan.po | 6 ++++++ .../networking/multiple_guest_networks.po | 6 ++++++ .../LC_MESSAGES/networking/multiple_ip_ranges.po | 6 ++++++ .../networking/multiple_ips_on_single_nic.po | 6 ++++++ .../multiple_subnets_in_shared_network.po | 6 ++++++ .../LC_MESSAGES/networking/networking_in_pod.po | 6 ++++++ .../LC_MESSAGES/networking/networking_in_zone.po | 6 ++++++ .../LC_MESSAGES/networking/palo_alto_config.po | 7 +++++++ .../networking/persistent_networks.po | 6 ++++++ .../fr/LC_MESSAGES/networking/portable_ips.po | 6 ++++++ .../public_ips_and_vlans_for_accounts.po | 7 +++++++ .../networking/releasing_an_ip_address.po | 6 ++++++ .../LC_MESSAGES/networking/remote_access_vpn.po | 7 +++++++ .../fr/LC_MESSAGES/networking/security_groups.po | 6 ++++++ .../LC_MESSAGES/networking/site_to_site_vpn.po | 10 ++++++++++ .../fr/LC_MESSAGES/networking/static_nat.po | 6 ++++++ .../networking/using_remote_access.po | 10 ++++++++++ .../networking/virtual_private_cloud_config.po | 8 ++++++++ source/locale/fr/LC_MESSAGES/networking2.po | 8 ++++++++ .../fr/LC_MESSAGES/networking_and_traffic.po | 7 +++++++ source/locale/fr/LC_MESSAGES/plugins/quota.po | 10 ++++++++++ source/locale/fr/LC_MESSAGES/projects.po | 6 ++++++ source/locale/fr/LC_MESSAGES/reliability.po | 7 +++++++ .../locale/fr/LC_MESSAGES/service_offerings.po | 7 +++++++ source/locale/fr/LC_MESSAGES/storage.po | 7 +++++++ source/locale/fr/LC_MESSAGES/systemvm.po | 7 +++++++ source/locale/fr/LC_MESSAGES/templates.po | 7 +++++++ .../fr/LC_MESSAGES/templates/_convert_hyperv.po | 8 ++++++++ .../fr/LC_MESSAGES/templates/_create_linux.po | 8 ++++++++ .../fr/LC_MESSAGES/templates/_create_windows.po | 8 ++++++++ .../fr/LC_MESSAGES/templates/_import_ami.po | 8 ++++++++ .../locale/fr/LC_MESSAGES/templates/_password.po | 8 ++++++++ source/locale/fr/LC_MESSAGES/troubleshooting.po | 6 ++++++ source/locale/fr/LC_MESSAGES/tuning.po | 6 ++++++ source/locale/fr/LC_MESSAGES/ui.po | 6 ++++++ source/locale/fr/LC_MESSAGES/usage.po | 6 ++++++ source/locale/fr/LC_MESSAGES/virtual_machines.po | 19 +++++++++++++++++++ .../fr/LC_MESSAGES/virtual_machines/user-data.po | 8 ++++++++ 60 files changed, 428 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/_global.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/_global.po index 4e235b1,2a73714..0be4762 --- a/source/locale/fr/LC_MESSAGES/_global.po +++ b/source/locale/fr/LC_MESSAGES/_global.po @@@ -1,20 -1,10 +1,30 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. + # + #, fuzzy ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/accounts.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/accounts.po index 3f04841,a6bd6e8..d67b0fb --- a/source/locale/fr/LC_MESSAGES/accounts.po +++ b/source/locale/fr/LC_MESSAGES/accounts.po @@@ -1,20 -1,9 +1,29 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # + # Translators: ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration RTD\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/administration.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/administration.po index 3f9d19e,ecc2a51..46ea7ea --- a/source/locale/fr/LC_MESSAGES/administration.po +++ b/source/locale/fr/LC_MESSAGES/administration.po @@@ -1,20 -1,8 +1,28 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. + # + # Translators: ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration RTD\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/api.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/api.po index 8c3bd69,c2fc974..67bd8fe --- a/source/locale/fr/LC_MESSAGES/api.po +++ b/source/locale/fr/LC_MESSAGES/api.po @@@ -1,20 -1,8 +1,28 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. + # + # Translators: ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration RTD\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/events.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/events.po index 00f9ec5,a9e407e..7f8ba41 --- a/source/locale/fr/LC_MESSAGES/events.po +++ b/source/locale/fr/LC_MESSAGES/events.po @@@ -1,20 -1,9 +1,29 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # + # Translators: ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration RTD\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/hosts.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/hosts.po index 61f5917,179c6e4..ad23346 --- a/source/locale/fr/LC_MESSAGES/hosts.po +++ b/source/locale/fr/LC_MESSAGES/hosts.po @@@ -1,20 -1,9 +1,29 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # + # Translators: ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration RTD\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/index.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/index.po index 0a49676,e9e9815..9cf0f9d --- a/source/locale/fr/LC_MESSAGES/index.po +++ b/source/locale/fr/LC_MESSAGES/index.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/management.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/management.po index 984d0ca,f490ee1..6e198b5 --- a/source/locale/fr/LC_MESSAGES/management.po +++ b/source/locale/fr/LC_MESSAGES/management.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking.po index 4375ad3,adc481e..f29fc2d --- a/source/locale/fr/LC_MESSAGES/networking.po +++ b/source/locale/fr/LC_MESSAGES/networking.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/acquiring_an_ip_address.po index 08c8dc4,22bf1c0..2f3da54 --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po index 2d917da,7d9fe6f..a22b77b --- a/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po +++ b/source/locale/fr/LC_MESSAGES/networking/advanced_zone_config.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po index 3c876b1,e8f99dd..c81ad86 --- a/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po +++ b/source/locale/fr/LC_MESSAGES/networking/basic_zone_config.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po index 7d0985f,1d98ddd..b36ea56 --- a/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po +++ b/source/locale/fr/LC_MESSAGES/networking/dns_and_dhcp.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/elastic_ips.po index e295668,d7604ff..9b0adde --- a/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po +++ b/source/locale/fr/LC_MESSAGES/networking/elastic_ips.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/external_firewalls_and_load_balancers.po index c612890,f7eef7a..e469943 --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/global_server_load_balancing.po index dd79592,71a128e..5201851 --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po index defe0d1,7b9191e..a8df576 --- a/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po +++ b/source/locale/fr/LC_MESSAGES/networking/guest_ip_ranges.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/guest_traffic.po index 18dc92c,e3b505b..0701be6 --- a/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po +++ b/source/locale/fr/LC_MESSAGES/networking/guest_traffic.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po index 8f6ef91,a81eae7..bff56b8 --- a/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po +++ b/source/locale/fr/LC_MESSAGES/networking/inter_vlan_routing.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/ip_forwarding_and_firewalling.po index 79e2cf2,319e708..ded49ae --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po index 1340e13,8b7e429..421304f --- a/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po +++ b/source/locale/fr/LC_MESSAGES/networking/ip_load_balancing.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/ip_reservation_in_guest_networks.po index 58b3acb,3c3256f..b542b54 --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/isolation_in_advanced_zone_with_vlan.po index 8ae74af,51563cc..991578a --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po index ae7da2a,f5e0f26..3078a22 --- a/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po +++ b/source/locale/fr/LC_MESSAGES/networking/multiple_guest_networks.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po index e8b1811,8cef98a..62cef0f --- a/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po +++ b/source/locale/fr/LC_MESSAGES/networking/multiple_ip_ranges.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/multiple_ips_on_single_nic.po index 18201df,2f39417..36dc789 --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/multiple_subnets_in_shared_network.po index a9a881d,9d4640f..030e2f0 --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po index 90bd52d,b4d93a8..cc82e4d --- a/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po +++ b/source/locale/fr/LC_MESSAGES/networking/networking_in_pod.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po index 93bb042,afff0b3..78bc41e --- a/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po +++ b/source/locale/fr/LC_MESSAGES/networking/networking_in_zone.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po index 9f0e88c,a0bfee6..14a0568 --- a/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po +++ b/source/locale/fr/LC_MESSAGES/networking/palo_alto_config.po @@@ -1,20 -1,7 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. + # ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # Translators: msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/persistent_networks.po index 0041092,a22ed6c..0e29927 --- a/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po +++ b/source/locale/fr/LC_MESSAGES/networking/persistent_networks.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/portable_ips.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/portable_ips.po index 9e47787,a6b5b59..58736d4 --- a/source/locale/fr/LC_MESSAGES/networking/portable_ips.po +++ b/source/locale/fr/LC_MESSAGES/networking/portable_ips.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po index 4cdccac,fb70571..8653e65 --- 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,20 -1,7 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. + # ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # Translators: msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/releasing_an_ip_address.po index 3c6110f,074d86f..6305505 --- 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,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po index e41e107,fe87ee4..1bb4760 --- a/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po +++ b/source/locale/fr/LC_MESSAGES/networking/remote_access_vpn.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/security_groups.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/security_groups.po index da8b42d,ec18cbe..4a4171a --- a/source/locale/fr/LC_MESSAGES/networking/security_groups.po +++ b/source/locale/fr/LC_MESSAGES/networking/security_groups.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/site_to_site_vpn.po index 4b76ef9,34bb765..9c5ba04 --- 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,20 -1,10 +1,30 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. + # + #, fuzzy ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/static_nat.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/static_nat.po index 94caabb,58d414b..1876651 --- a/source/locale/fr/LC_MESSAGES/networking/static_nat.po +++ b/source/locale/fr/LC_MESSAGES/networking/static_nat.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/using_remote_access.po index 140aa13,e4ece6c..b6674b4 --- a/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po +++ b/source/locale/fr/LC_MESSAGES/networking/using_remote_access.po @@@ -1,20 -1,10 +1,30 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. + # + #, fuzzy ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking/virtual_private_cloud_config.po index f30df63,176acbe..82410bd --- 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,20 -1,8 +1,28 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. + # + # Translators: ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration RTD\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking2.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking2.po index c508b6f,79576da..a977a3d --- a/source/locale/fr/LC_MESSAGES/networking2.po +++ b/source/locale/fr/LC_MESSAGES/networking2.po @@@ -1,19 -1,8 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/networking_and_traffic.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/networking_and_traffic.po index 2287cc9,a3ff945..ee9df80 --- a/source/locale/fr/LC_MESSAGES/networking_and_traffic.po +++ b/source/locale/fr/LC_MESSAGES/networking_and_traffic.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/plugins/quota.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/plugins/quota.po index 860bac2,2d88a73..7172ab1 --- a/source/locale/fr/LC_MESSAGES/plugins/quota.po +++ b/source/locale/fr/LC_MESSAGES/plugins/quota.po @@@ -1,20 -1,10 +1,30 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. + # + #, fuzzy ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d msgid "" msgstr "" "Project-Id-Version: Apache CloudStack Administration Documentation 4.8\n" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/projects.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/projects.po index 2ec435b,9076864..1c077a6 --- a/source/locale/fr/LC_MESSAGES/projects.po +++ b/source/locale/fr/LC_MESSAGES/projects.po @@@ -1,19 -1,6 +1,25 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/reliability.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/reliability.po index 0054876,20b925f..a58881a --- a/source/locale/fr/LC_MESSAGES/reliability.po +++ b/source/locale/fr/LC_MESSAGES/reliability.po @@@ -1,20 -1,7 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. + # ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # Translators: msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/service_offerings.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/service_offerings.po index a33f571,6086a0e..051fd8e --- a/source/locale/fr/LC_MESSAGES/service_offerings.po +++ b/source/locale/fr/LC_MESSAGES/service_offerings.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/storage.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/storage.po index 4f757b6,0b29fd4..b63b20d --- a/source/locale/fr/LC_MESSAGES/storage.po +++ b/source/locale/fr/LC_MESSAGES/storage.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/systemvm.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/systemvm.po index de5616c,66b3e7f..09c0975 --- a/source/locale/fr/LC_MESSAGES/systemvm.po +++ b/source/locale/fr/LC_MESSAGES/systemvm.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/templates.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/templates.po index 4f606f3,6a250b4..b57c8c4 --- a/source/locale/fr/LC_MESSAGES/templates.po +++ b/source/locale/fr/LC_MESSAGES/templates.po @@@ -1,19 -1,7 +1,26 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # # Translators: msgid "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po index 7da450d,a4111c9..1e647ec --- a/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po +++ b/source/locale/fr/LC_MESSAGES/templates/_convert_hyperv.po @@@ -1,19 -1,8 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/templates/_create_linux.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/templates/_create_linux.po index c8543a1,9fe9bb3..f616d3c --- a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po +++ b/source/locale/fr/LC_MESSAGES/templates/_create_linux.po @@@ -1,19 -1,8 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/templates/_create_windows.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/templates/_create_windows.po index 41376c9,7088635..3eb89ec --- a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po +++ b/source/locale/fr/LC_MESSAGES/templates/_create_windows.po @@@ -1,19 -1,8 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/templates/_import_ami.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/templates/_import_ami.po index 6929085,9e93911..ce122d2 --- a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po +++ b/source/locale/fr/LC_MESSAGES/templates/_import_ami.po @@@ -1,19 -1,8 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # msgid "" msgstr "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/dce470ef/source/locale/fr/LC_MESSAGES/templates/_password.po ---------------------------------------------------------------------- diff --cc source/locale/fr/LC_MESSAGES/templates/_password.po index 6862aa6,293c639..32af16a --- a/source/locale/fr/LC_MESSAGES/templates/_password.po +++ b/source/locale/fr/LC_MESSAGES/templates/_password.po @@@ -1,19 -1,8 +1,27 @@@ ++<<<<<<< HEAD +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. ++======= + # SOME DESCRIPTIVE TITLE. + # Copyright (C) 2016, Apache Software Foundation + # This file is distributed under the same license as the Apache CloudStack + # Administration Documentation package. + # FIRST AUTHOR <EMAIL@ADDRESS>, 2016. ++>>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d # msgid "" msgstr ""
