Merge "Release Import of Translations from Transifex" into stable/kilo

trove/locale/ko_KR/LC_MESSAGES/trove-log-warning.po

@@ -1,46 +0,0 @@
-# Translations template for trove.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the trove project.
-#
-# Translators:
-# Mario Cho <hephaex@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: trove\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-13 06:10+0000\n"
-"PO-Revision-Date: 2015-03-12 10:28+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/trove/"
-"language/ko_KR/)\n"
-"Language: ko_KR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: trove/common/profile.py:38
-msgid ""
-"The OpenStack Profiler is enabled. Using one of the hmac_keys specified in "
-"the api-paste.ini file (typically in /etc/trove), a trace can be made of all "
-"requests. Only an admin user can retrieve the trace information, however.\n"
-"To disable the profiler, add the following to the configuration file:\n"
-"[profiler]\n"
-"enabled=false"
-msgstr ""
-
-#: trove/instance/models.py:446
-#, python-format
-msgid "Could not load instance %s."
-msgstr ""
-
-#: trove/openstack/common/loopingcall.py:87
-#, python-format
-msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
-msgstr ""
-
-#: trove/openstack/common/service.py:356
-#, python-format
-msgid "pid %d not in child list"
-msgstr "자식 리스트가 아닌 pid %d "

trove/locale/trove-log-info.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: trove 2015.1.dev3\n"
+"Project-Id-Version: trove 2015.1.dev1.g9ea915c\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-08 06:04+0000\n"
+"POT-Creation-Date: 2015-04-20 12:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,84 +17,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: trove/instance/models.py:618
+#: trove/instance/models.py:629
 #, python-format
 msgid "Resetting task status to NONE on instance %s."
 msgstr ""
 
-#: trove/instance/models.py:809
+#: trove/instance/models.py:857
 #, python-format
 msgid "Resizing instance %(instance_id)s flavor to %(flavor_id)s."
 msgstr ""
 
-#: trove/instance/models.py:849
+#: trove/instance/models.py:894
 #, python-format
 msgid "Resizing volume of instance %s."
 msgstr ""
 
-#: trove/instance/models.py:872
+#: trove/instance/models.py:917
 #, python-format
 msgid "Rebooting instance %s."
 msgstr ""
 
-#: trove/instance/models.py:880
+#: trove/instance/models.py:925
 #, python-format
 msgid "Restarting datastore on instance %s."
 msgstr ""
 
-#: trove/instance/models.py:894
+#: trove/instance/models.py:939
 #, python-format
 msgid "Detaching instance %s from its replication source."
 msgstr ""
 
-#: trove/instance/models.py:903
+#: trove/instance/models.py:948
+#, python-format
+msgid "Promoting instance %s to replication source."
+msgstr ""
+
+#: trove/instance/models.py:963
+#, python-format
+msgid "Ejecting replica source %s from it's replication set."
+msgstr ""
+
+#: trove/instance/models.py:986
 #, python-format
 msgid "Migrating instance id = %(instance_id)s to host = %(host)s."
 msgstr ""
 
-#: trove/instance/service.py:89
+#: trove/instance/service.py:92
 #, python-format
 msgid ""
 "Performing %(action_name)s action against instance %(instance_id)s for "
 "tenant '%(tenant_id)s'"
 msgstr ""
 
-#: trove/instance/service.py:136
+#: trove/instance/service.py:147
 #, python-format
 msgid "Listing database instances for tenant '%s'"
 msgstr ""
 
-#: trove/instance/service.py:149
+#: trove/instance/service.py:160
 #, python-format
 msgid "Listing backups for instance '%s'"
 msgstr ""
 
-#: trove/instance/service.py:161
+#: trove/instance/service.py:172
 #, python-format
 msgid "Showing database instance '%(instance_id)s' for tenant '%(tenant_id)s'"
 msgstr ""
 
-#: trove/instance/service.py:174
+#: trove/instance/service.py:185
 #, python-format
 msgid "Deleting database instance '%(instance_id)s' for tenant '%(tenant_id)s'"
 msgstr ""
 
-#: trove/instance/service.py:187
+#: trove/instance/service.py:198
 #, python-format
 msgid "Creating a database instance for tenant '%s'"
 msgstr ""
 
-#: trove/instance/service.py:248
+#: trove/instance/service.py:281
 #, python-format
 msgid "Updating database instance '%(instance_id)s' for tenant '%(tenant_id)s'"
 msgstr ""
 
-#: trove/instance/service.py:277
+#: trove/instance/service.py:300
 #, python-format
 msgid "Editing instance for tenant id %s."
 msgstr ""
 
-#: trove/instance/service.py:315
+#: trove/instance/service.py:320
 #, python-format
 msgid "Getting default configuration for instance %s"
 msgstr ""