http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_create_linux.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/templates/_create_linux.mo and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_create_linux.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_linux.po b/source/locale/fr/LC_MESSAGES/templates/_create_linux.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_create_windows.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/templates/_create_windows.mo and /dev/null differ http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_create_windows.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/templates/_create_windows.po b/source/locale/fr/LC_MESSAGES/templates/_create_windows.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_import_ami.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/templates/_import_ami.mo and /dev/null differ http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_import_ami.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/templates/_import_ami.po b/source/locale/fr/LC_MESSAGES/templates/_import_ami.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_password.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/templates/_password.mo and /dev/null differ http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/templates/_password.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/templates/_password.po b/source/locale/fr/LC_MESSAGES/templates/_password.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/troubleshooting.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/troubleshooting.mo and /dev/null differ http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/troubleshooting.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/troubleshooting.po b/source/locale/fr/LC_MESSAGES/troubleshooting.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/tuning.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/tuning.mo and /dev/null differ http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/tuning.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/tuning.po b/source/locale/fr/LC_MESSAGES/tuning.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/ui.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/ui.mo and /dev/null differ http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/ui.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/ui.po b/source/locale/fr/LC_MESSAGES/ui.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/usage.mo ---------------------------------------------------------------------- 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 Binary files a/source/locale/fr/LC_MESSAGES/usage.mo and /dev/null differ http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/usage.po ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/usage.po b/source/locale/fr/LC_MESSAGES/usage.po index 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 "" http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/virtual_machines.mo ---------------------------------------------------------------------- diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines.mo b/source/locale/fr/LC_MESSAGES/virtual_machines.mo deleted file mode 100644 index 2fa0de6..0000000 Binary files a/source/locale/fr/LC_MESSAGES/virtual_machines.mo and /dev/null differ
