Merge "Imported Translations from Zanata" into stable/liberty

2 files changed, 35 insertions, 13 deletions

diff --git a/nova/locale/fr/LC_MESSAGES/nova-log-error.po b/nova/locale/fr/LC_MESSAGES/nova-log-error.po
index 8741988bec..871bf9fd11 100644
--- a/nova/locale/fr/LC_MESSAGES/nova-log-error.po
+++ b/nova/locale/fr/LC_MESSAGES/nova-log-error.po
@@ -7,14 +7,15 @@
 # Lucas Mascaro <mascaro.lucas@yahoo.fr>, 2015
 # Maxime COQUEREL <max.coquerel@gmail.com>, 2014-2015
 # Corinne Verheyde <cverheyd@gmail.com>, 2015. #zanata
+# Kevin Tibi <kodokuu@gmail.com>, 2015. #zanata
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 12.0.0.0b4.dev203\n"
+"Project-Id-Version: nova 12.0.0.0rc2.dev13\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-16 19:02+0000\n"
-"PO-Revision-Date: 2015-09-12 08:50+0000\n"
-"Last-Translator: Corinne Verheyde <cverheyd@gmail.com>\n"
+"POT-Creation-Date: 2015-10-06 06:38+0000\n"
+"PO-Revision-Date: 2015-10-05 02:58+0000\n"
+"Last-Translator: Kevin Tibi <kodokuu@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/openstack/nova/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -74,6 +75,11 @@ msgstr "La fixation des périphériques PCI %(dev)s à %(dom)s a echoué."
 msgid "Attaching network adapter failed. Exception:  %s"
 msgstr "La fixation de l'adaptateur réseau a échoué. Exception : %s"
 
+#, python-format
+msgid "Cannot block migrate instance %s with mapped volumes"
+msgstr ""
+"Impossible de bloquer l'instance de migration %s avec des volumes mappés"
+
 msgid "Cannot cleanup migration files"
 msgstr "Impossible de nettoyer les fichiers de migration"
 
@@ -639,6 +645,9 @@ msgstr "Echec de rétablissement de la migration interrompue"
 msgid "Failed to roll back reservations %s"
 msgstr "Échec à restaurer les réservations %s"
 
+msgid "Failed to rollback quota for failed finish_resize"
+msgstr "Échec du retour en arrière des quotas pour échoué finish_resize"
+
 #, python-format
 msgid "Failed to send message to cell: %(next_hop)s"
 msgstr "Echec de l'envoi du message à la cellule: %(next_hop)s"
@@ -687,6 +696,11 @@ msgstr "Echec de la reprise de l'instance"
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "Echec de la décompression de %(image_location)s dans %(image_path)s"
 
+msgid "Failed to update usages bulk deallocating floating IP"
+msgstr ""
+"Echec de la mise à jour de l'utilisation de désallocation des l'adresses IP "
+"flottante"
+
 msgid "Failed to update usages deallocating fixed IP"
 msgstr ""
 "Echec de la mise à jour des messages de désallocation de l'adresse IP fixe"
@@ -809,6 +823,9 @@ msgstr "Défaillance de Keystone : %s"
 msgid "Live Migration failure: %s"
 msgstr "Migration Directe a échoué : %s"
 
+msgid "Live migration failed."
+msgstr "Échec de la migration à chaud."
+
 msgid "Migrate Receive failed"
 msgstr "Echec de réception de la migration"
 
@@ -1122,6 +1139,11 @@ msgid "Unable to update host of port %s"
 msgstr "Incapable de mettre à jour l'hôte du port %s"
 
 #, python-format
+msgid "Unable to update instance VNIC index for port %s."
+msgstr ""
+"Impossible de mettre à jour les index des VNIC des instances pour le port %s."
+
+#, python-format
 msgid "Unexpected %(ex_name)s raised: %(ex_str)s"
 msgstr "%(ex_name)s inattendu levé : %(ex_str)s"
 
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index bcdd7d665a..acad42212f 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -13,10 +13,10 @@
 # Mie Yamamoto <myamamot@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 12.0.0.0rc2.dev3\n"
+"Project-Id-Version: nova 12.0.0.0rc2.dev13\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-03 06:33+0000\n"
-"PO-Revision-Date: 2015-09-30 03:11+0000\n"
+"POT-Creation-Date: 2015-10-06 06:38+0000\n"
+"PO-Revision-Date: 2015-10-06 04:52+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language: ja\n"
 "Language-Team: Japanese (http://www.transifex.com/openstack/nova/language/"
@@ -4257,12 +4257,12 @@ msgstr ""
 "%(instance_uuid)s をマイグレーションできません: インスタンスのディスクが大き"
 "すぎます (宛先ホスト上の使用可能量:%(available)s < 必要量:%(necessary)s)"
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
-"インスタンス (%(instance_id)s) を現在のホスト (%(host)s) にマイグレーションす"
-"ることはできません。"
+"インスタンス (%(instance_id)s) を現在と同じホスト (%(host)s) にマイグレーショ"
+"ンすることはできません。"
 
 #, python-format
 msgid "Unable to mount SMBFS share: %(smbfs_share)s WMI exception: %(wmi_exc)s"
@@ -4533,13 +4533,13 @@ msgstr ""
 msgid "Value required for 'scality_sofs_config'"
 msgstr "'scality_sofs_config' の値が必要です"
 
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Version %(req_ver)s is not supported by the API. Minimum is %(min_ver)s and "
 "maximum is %(max_ver)s."
 msgstr ""
-"バージョン %(req_ver)s は API ではサポートされていません。最小は%(min_ver)s、"
-"最大は %(max_ver)s です。"
+"バージョン %(req_ver)s はこの API ではサポートされていません。最小"
+"は%(min_ver)s、最大は %(max_ver)s です。"
 
 msgid "Virt driver does not implement host disabled status."
 msgstr "virt ドライバーがホスト無効化時のステータスを実装していません。"