diff --git a/magnum/locale/ja/LC_MESSAGES/magnum.po b/magnum/locale/ja/LC_MESSAGES/magnum.po
index c8fe7271a2..1e46ee4f3c 100644
--- a/magnum/locale/ja/LC_MESSAGES/magnum.po
+++ b/magnum/locale/ja/LC_MESSAGES/magnum.po
@@ -1,9 +1,9 @@
-# Shu Muto <shu-mutou@rf.jp.nec.com>, 2015. #zanata
+# Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 1.1.1.dev262\n"
+"Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-01-17 07:33+0000\n"
+"POT-Creation-Date: 2016-04-17 04:37+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -71,10 +71,6 @@ msgstr "Magnumサービス %(magnum_service_id)s が見つかりませんでし
 msgid "A magnum service with ID %(id)s already exists."
 msgstr "ID %(id)s を持つMagnumサービスは既に存在します。"
 
-#, python-format
-msgid "A node with UUID %(uuid)s already exists."
-msgstr "UUID %(uuid)s のノードは既に存在します。"
-
 #, python-format
 msgid "An object of class %s is required here"
 msgstr "%s クラスのオブジェクトがここに必要です。"
@@ -123,9 +119,6 @@ msgstr "既存のベイモデルの UUID を上書きできません。"
 msgid "Cannot overwrite UUID for an existing Container."
 msgstr "既存のコンテナーの UUID を上書きできません。"
 
-msgid "Cannot overwrite UUID for an existing Node."
-msgstr "既存のノードの UUID を上書きできません。"
-
 msgid "Cannot overwrite UUID for an existing Pod."
 msgstr "既存のポッドの UUID を上書きできません。"
 
@@ -223,14 +216,6 @@ msgstr "イメージ %(image_id)s は os_distro フィールドを含んでい
 msgid "Instance %(instance)s could not be found."
 msgstr "インスタンス %(instance)s が見つかりませんでした。"
 
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s is already associated with a node, it cannot be "
-"associated with this other node %(node)s"
-msgstr ""
-"インスタンス %(instance_uuid)s は既にノードに関連付けられており、この他のノー"
-"ド %(node)s に関連付けることはできません。"
-
 #, python-format
 msgid "Invalid URL scheme %s"
 msgstr "URL スキーム %s は無効です"
@@ -302,14 +287,6 @@ msgstr ""
 "あり、ZeroMQを使用する場合には、有効なホスト名、FQDN、またはIP アドレスでなけ"
 "ればなりません。"
 
-#, python-format
-msgid "Node %(node)s could not be found."
-msgstr "ノード %(node)s が見つかりませんでした。"
-
-#, python-format
-msgid "Node %(node)s is associated with instance %(instance)s."
-msgstr "ノード %(node)s はインスタンス %(instance)s に関連付けられています。"
-
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "イメージ %(image_id)s では許可されていません。"
@@ -342,6 +319,10 @@ msgstr ""
 msgid "Pod %(pod)s could not be found."
 msgstr "ポッド %(pod)s が見つかりませんでした。"
 
+#, python-format
+msgid "Policy doesn't allow %(action)s to be performed."
+msgstr "ポリシーにより %(action)s の実行が許可されていません"
+
 msgid "Private Key could not be read."
 msgstr "秘密鍵は読み込まれませんでした。"
 
diff --git a/magnum/locale/magnum-log-error.pot b/magnum/locale/magnum-log-error.pot
index e747799ec8..e51d55af4b 100644
--- a/magnum/locale/magnum-log-error.pot
+++ b/magnum/locale/magnum-log-error.pot
@@ -1,14 +1,14 @@
-# Translations template for magnum.
+# Translations template for PROJECT.
 # Copyright (C) 2016 ORGANIZATION
-# This file is distributed under the same license as the magnum project.
+# This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 1.1.1.dev262\n"
+"Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-01-18 06:03+0000\n"
+"POT-Creation-Date: 2016-04-17 06:03+0000\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,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
 
-#: magnum/api/controllers/v1/container.py:304
+#: magnum/api/controllers/v1/container.py:326
 #, python-format
 msgid "Error while list container %(uuid)s: %(e)s."
 msgstr ""
 
-#: magnum/cmd/conductor.py:67
+#: magnum/cmd/conductor.py:66
 #, python-format
 msgid ""
 "The Heat template can not be found for either k8s atomic "
@@ -40,33 +40,41 @@ msgstr ""
 msgid "Exception in string format operation, kwargs: %s"
 msgstr ""
 
-#: magnum/common/keystone.py:102
-msgid "Unknown version in auth_token_info"
+#: magnum/common/keystone.py:117
+msgid "Keystone API connection failed: no password, trust_id or token found."
 msgstr ""
 
-#: magnum/common/keystone.py:107
-msgid "Keystone v3 API conntection failed, no password trust or auth_token"
-msgstr ""
-
-#: magnum/common/keystone.py:124
+#: magnum/common/keystone.py:185
 msgid "Failed to create trust"
 msgstr ""
 
-#: magnum/common/keystone.py:141
+#: magnum/common/keystone.py:212
 msgid "Failed to delete trust"
 msgstr ""
 
-#: magnum/common/utils.py:362
+#: magnum/common/keystone.py:222
+msgid "Failed to create trustee"
+msgstr ""
+
+#: magnum/common/keystone.py:233
+msgid "Failed to delete trustee"
+msgstr ""
+
+#: magnum/common/keystone.py:247
+msgid "Failed to list regions"
+msgstr ""
+
+#: magnum/common/utils.py:372
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: magnum/common/utils.py:393
+#: magnum/common/utils.py:403
 #, python-format
 msgid "Failed to make file system. File system %s is not supported."
 msgstr ""
 
-#: magnum/common/utils.py:397
+#: magnum/common/utils.py:407
 #, python-format
 msgid "Failed to create a file system in %(path)s. Error: %(error)s"
 msgstr ""
@@ -108,28 +116,42 @@ msgstr ""
 msgid "Failed to delete certificate {0}."
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:276
-#: magnum/conductor/handlers/bay_conductor.py:284
+#: magnum/common/x509/operations.py:180
+msgid "Received invalid csr {0}."
+msgstr ""
+
+#: magnum/conductor/handlers/bay_conductor.py:265
+#: magnum/conductor/handlers/bay_conductor.py:273
 #, python-format
 msgid ""
 "Bay check exit after %(attempts)s attempts,stack_id: %(id)s, "
 "stack_status: %(status)s"
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:314
+#: magnum/conductor/handlers/bay_conductor.py:306
 #, python-format
 msgid ""
 "Bay error, stack status: %(bay_status)s, stack_id: %(stack_id)s, reason: "
 "%(reason)s"
 msgstr ""
 
-#: magnum/conductor/handlers/docker_conductor.py:39
+#: magnum/conductor/handlers/docker_conductor.py:41
 #, python-format
 msgid "Error while connect to docker container %s"
 msgstr ""
 
-#: magnum/conductor/handlers/docker_conductor.py:115
+#: magnum/conductor/handlers/docker_conductor.py:123
 #, python-format
 msgid "Can not find docker instance with %s,set it to Error status"
 msgstr ""
 
+#: magnum/conductor/handlers/common/cert_manager.py:105
+#, python-format
+msgid "Failed to generate certificates for Bay: %s"
+msgstr ""
+
+#: magnum/conductor/handlers/common/trust_manager.py:40
+#, python-format
+msgid "Failed to create trustee and trust for Bay: %s"
+msgstr ""
+
diff --git a/magnum/locale/magnum-log-info.pot b/magnum/locale/magnum-log-info.pot
index 64832de35a..4ddc24ff99 100644
--- a/magnum/locale/magnum-log-info.pot
+++ b/magnum/locale/magnum-log-info.pot
@@ -1,14 +1,14 @@
-# Translations template for magnum.
+# Translations template for PROJECT.
 # Copyright (C) 2016 ORGANIZATION
-# This file is distributed under the same license as the magnum project.
+# This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 1.1.1.dev262\n"
+"Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-01-18 06:03+0000\n"
+"POT-Creation-Date: 2016-04-17 06:03+0000\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,17 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
 
-#: magnum/cmd/api.py:50 magnum/cmd/conductor.py:48
+#: magnum/cmd/api.py:49 magnum/cmd/conductor.py:47
 #, python-format
 msgid "Starting server in PID %s"
 msgstr ""
 
-#: magnum/cmd/api.py:55
-#, python-format
-msgid "serving on 0.0.0.0:%(port)s, view at http://127.0.0.1:%(port)s"
-msgstr ""
-
-#: magnum/cmd/api.py:59
+#: magnum/cmd/api.py:53
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr ""
@@ -62,19 +57,19 @@ msgstr ""
 msgid "Require removal of hosts: %s"
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:212
+#: magnum/conductor/handlers/bay_conductor.py:199
 #, python-format
 msgid "The stack %s was not be found during bay deletion."
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:218
-#: magnum/conductor/handlers/bay_conductor.py:298
+#: magnum/conductor/handlers/bay_conductor.py:206
+#: magnum/conductor/handlers/bay_conductor.py:290
 #: magnum/service/periodic.py:128
 #, python-format
 msgid "The bay %s has been deleted by others."
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:292
+#: magnum/conductor/handlers/bay_conductor.py:281
 #, python-format
 msgid "Bay has been deleted, stack_id: %s"
 msgstr ""
diff --git a/magnum/locale/magnum-log-warning.pot b/magnum/locale/magnum-log-warning.pot
index ad4eb4a7e1..66234d3170 100644
--- a/magnum/locale/magnum-log-warning.pot
+++ b/magnum/locale/magnum-log-warning.pot
@@ -1,14 +1,14 @@
-# Translations template for magnum.
+# Translations template for PROJECT.
 # Copyright (C) 2016 ORGANIZATION
-# This file is distributed under the same license as the magnum project.
+# This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 1.1.1.dev262\n"
+"Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-01-18 06:03+0000\n"
+"POT-Creation-Date: 2016-04-17 06:03+0000\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,22 +17,29 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
 
-#: magnum/common/utils.py:409
+#: magnum/common/keystone.py:124
+#, python-format
+msgid ""
+"Auth plugin and its options for service user must be provided in "
+"[%(new)s] section. Using values from [%(old)s] section is deprecated."
+msgstr ""
+
+#: magnum/common/utils.py:419
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: magnum/common/utils.py:418
+#: magnum/common/utils.py:428
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: magnum/common/utils.py:434
+#: magnum/common/utils.py:444
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: magnum/common/utils.py:448
+#: magnum/common/utils.py:458
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -76,14 +83,14 @@ msgstr ""
 msgid "Ignore error [%(e)s] when inspecting container %(container_id)s."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:142
+#: magnum/conductor/template_definition.py:139
 #, python-format
 msgid "stack does not have output_key %s"
 msgstr ""
 
-#: magnum/conductor/handlers/common/cert_manager.py:153
+#: magnum/conductor/handlers/common/cert_manager.py:172
 #, python-format
-msgid "Deleting cert is failed: %s"
+msgid "Deleting certs is failed for Bay %s"
 msgstr ""
 
 #: magnum/service/periodic.py:101
diff --git a/magnum/locale/magnum.pot b/magnum/locale/magnum.pot
index 3ef7029ab1..2f91319966 100644
--- a/magnum/locale/magnum.pot
+++ b/magnum/locale/magnum.pot
@@ -1,14 +1,14 @@
-# Translations template for magnum.
+# Translations template for PROJECT.
 # Copyright (C) 2016 ORGANIZATION
-# This file is distributed under the same license as the magnum project.
+# This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 1.1.1.dev262\n"
+"Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-01-18 06:03+0000\n"
+"POT-Creation-Date: 2016-04-17 06:03+0000\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,21 +17,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
 
+#: magnum/api/app.py:84
+#, python-format
+msgid "Full WSGI config used: %s"
+msgstr ""
+
 #: magnum/api/utils.py:36
 msgid "Limit must be positive"
 msgstr ""
 
-#: magnum/api/utils.py:43
+#: magnum/api/utils.py:46
 #, python-format
 msgid "Invalid sort direction: %s. Acceptable values are 'asc' or 'desc'"
 msgstr ""
 
-#: magnum/api/utils.py:54
+#: magnum/api/utils.py:57
 #, python-format
 msgid "Adding a new attribute %s to the root of the resource is not allowed."
 msgstr ""
 
-#: magnum/api/utils.py:58
+#: magnum/api/utils.py:61
 #, python-format
 msgid "The attribute %s has existed, please use 'replace' operation instead."
 msgstr ""
@@ -69,38 +74,50 @@ msgstr ""
 msgid "Default network driver for mesos baymodels."
 msgstr ""
 
-#: magnum/api/validation.py:77
+#: magnum/api/validation.py:80
 #, python-format
 msgid ""
 "Cannot fulfill request with a %(bay_type)s bay, expecting a "
 "%(supported_bay_types)s bay."
 msgstr ""
 
-#: magnum/api/validation.py:132
+#: magnum/api/validation.py:164
+#, python-format
+msgid "cannot change bay property(ies) %s."
+msgstr ""
+
+#: magnum/api/validation.py:185
 #, python-format
 msgid "Requested COE type %s is not supported."
 msgstr ""
 
-#: magnum/api/validation.py:143
+#: magnum/api/validation.py:196
 #, python-format
 msgid ""
 "Network driver type %(driver)s is not supported, expecting a "
 "%(supported_drivers)s network driver."
 msgstr ""
 
-#: magnum/api/validation.py:155
+#: magnum/api/validation.py:208
 #, python-format
 msgid ""
 "Network driver type %(driver)s is not allowed, expecting a "
 "%(allowed_drivers)s network driver. "
 msgstr ""
 
+#: magnum/api/validation.py:223
+#, python-format
+msgid ""
+"Volume driver type %(driver)s is not supported, expecting a "
+"%(supported_volume_driver)s volume driver."
+msgstr ""
+
 #: magnum/api/controllers/base.py:103
 #, python-format
 msgid "Invalid value for %s header"
 msgstr ""
 
-#: magnum/api/controllers/v1/__init__.py:215
+#: magnum/api/controllers/v1/__init__.py:213
 #, python-format
 msgid ""
 "Mutually exclusive versions requested. Version %(ver)s requested but not "
@@ -108,7 +125,7 @@ msgid ""
 "%(max)s]."
 msgstr ""
 
-#: magnum/api/controllers/v1/__init__.py:225
+#: magnum/api/controllers/v1/__init__.py:223
 #, python-format
 msgid ""
 "Version %(ver)s was requested but the minor version is not supported by "
@@ -165,7 +182,7 @@ msgstr ""
 msgid "Cannot compile public API routes: %s"
 msgstr ""
 
-#: magnum/api/middleware/parsable_error.py:42
+#: magnum/api/middleware/parsable_error.py:43
 #, python-format
 msgid "ErrorDocumentMiddleware received an invalid status %s"
 msgstr ""
@@ -173,6 +190,7 @@ msgstr ""
 #: magnum/common/clients.py:29 magnum/common/clients.py:39
 #: magnum/common/clients.py:63 magnum/common/clients.py:76
 #: magnum/common/clients.py:86 magnum/common/clients.py:99
+#: magnum/common/clients.py:109
 msgid ""
 "Region in Identity service catalog to use for communication with the "
 "OpenStack service."
@@ -301,287 +319,299 @@ msgstr ""
 msgid "Expected an uuid or int but received %(identity)s."
 msgstr ""
 
-#: magnum/common/exception.py:303
+#: magnum/common/exception.py:299
+#, python-format
+msgid "Received invalid csr %(csr)s."
+msgstr ""
+
+#: magnum/common/exception.py:307
 msgid "Conflict."
 msgstr ""
 
-#: magnum/common/exception.py:308
+#: magnum/common/exception.py:312
 msgid "Invalid resource state."
 msgstr ""
 
-#: magnum/common/exception.py:314
-#, python-format
-msgid "%(err)s"
-msgstr ""
-
 #: magnum/common/exception.py:318
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s is already associated with a node, it cannot "
-"be associated with this other node %(node)s"
+msgid "%(err)s"
 msgstr ""
 
-#: magnum/common/exception.py:323
+#: magnum/common/exception.py:322
 #, python-format
 msgid "Instance %(instance)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:327
+#: magnum/common/exception.py:326
 #, python-format
 msgid "Couldn't apply patch '%(patch)s'. Reason: %(reason)s"
 msgstr ""
 
-#: magnum/common/exception.py:331
+#: magnum/common/exception.py:330
 msgid "Not authorized."
 msgstr ""
 
-#: magnum/common/exception.py:336
+#: magnum/common/exception.py:335
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: magnum/common/exception.py:342
+#: magnum/common/exception.py:341
 msgid "Request not acceptable."
 msgstr ""
 
-#: magnum/common/exception.py:347
+#: magnum/common/exception.py:346
 #, python-format
 msgid "Expected a MAC address but received %(mac)s."
 msgstr ""
 
-#: magnum/common/exception.py:351
+#: magnum/common/exception.py:350
 #, python-format
 msgid "Invalid configuration file. %(error_msg)s"
 msgstr ""
 
-#: magnum/common/exception.py:355
-#, python-format
-msgid "A node with UUID %(uuid)s already exists."
-msgstr ""
-
-#: magnum/common/exception.py:359
-#, python-format
-msgid "Node %(node)s could not be found."
-msgstr ""
-
-#: magnum/common/exception.py:363
-#, python-format
-msgid "Node %(node)s is associated with instance %(instance)s."
-msgstr ""
-
-#: magnum/common/exception.py:367
+#: magnum/common/exception.py:354
 #, python-format
 msgid "Failed to establish SSH connection to host %(host)s."
 msgstr ""
 
-#: magnum/common/exception.py:371
+#: magnum/common/exception.py:358
 #, python-format
 msgid "Failed to create a file system. File system %(fs)s is not supported."
 msgstr ""
 
-#: magnum/common/exception.py:376
+#: magnum/common/exception.py:363
 #, python-format
 msgid "Baymodel %(baymodel)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:380
+#: magnum/common/exception.py:367
 #, python-format
 msgid "A baymodel with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:384
+#: magnum/common/exception.py:371
 #, python-format
 msgid "Baymodel %(baymodel)s is referenced by one or multiple bays."
 msgstr ""
 
-#: magnum/common/exception.py:388
+#: magnum/common/exception.py:375
 msgid "Not authorized to set public flag for baymodel."
 msgstr ""
 
-#: magnum/common/exception.py:392
+#: magnum/common/exception.py:379
 #, python-format
 msgid "Bay %(bay)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:396
+#: magnum/common/exception.py:383
 #, python-format
 msgid "A bay with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:400
+#: magnum/common/exception.py:387
 #, python-format
 msgid "Container %(container)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:404
+#: magnum/common/exception.py:391
 #, python-format
 msgid "A container with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:408
+#: magnum/common/exception.py:395
 #, python-format
 msgid "Pod %(pod)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:412
+#: magnum/common/exception.py:399
 #, python-format
 msgid "A pod with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:416
+#: magnum/common/exception.py:403
 #, python-format
 msgid "Pod list could not be found for Bay %(bay_uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:420
+#: magnum/common/exception.py:407
 #, python-format
 msgid "Pod creation failed in Bay %(bay_uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:424
+#: magnum/common/exception.py:411
 #, python-format
 msgid "ReplicationController %(rc)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:428
+#: magnum/common/exception.py:415
 #, python-format
 msgid "A ReplicationController with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:432
+#: magnum/common/exception.py:419
 #, python-format
 msgid "ReplicationController list could not be found for Bay %(bay_uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:437
+#: magnum/common/exception.py:424
 #, python-format
 msgid "ReplicationController creation failed for Bay %(bay_uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:442
+#: magnum/common/exception.py:429
 #, python-format
 msgid "Service %(service)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:446
+#: magnum/common/exception.py:433
 #, python-format
 msgid "A service with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:450
+#: magnum/common/exception.py:437
 #, python-format
 msgid "Service list could not be found for Bay %(bay_uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:454
+#: magnum/common/exception.py:441
 #, python-format
 msgid "Service creation failed for Bay %(bay_uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:462
+#: magnum/common/exception.py:449
 #, python-format
 msgid "%(operation)s is not supported."
 msgstr ""
 
-#: magnum/common/exception.py:467
+#: magnum/common/exception.py:454
 #, python-format
 msgid "Bay type (%(server_type)s, %(os)s, %(coe)s) not supported."
 msgstr ""
 
-#: magnum/common/exception.py:472
+#: magnum/common/exception.py:459
 #, python-format
 msgid "Bay type (%(server_type)s, %(os)s, %(coe)s) not enabled."
 msgstr ""
 
-#: magnum/common/exception.py:477
+#: magnum/common/exception.py:464
 #, python-format
 msgid "Required parameter %(heat_param)s not provided."
 msgstr ""
 
-#: magnum/common/exception.py:481
+#: magnum/common/exception.py:468
 #, python-format
 msgid "The urllib2 URL %(url)s has an invalid scheme."
 msgstr ""
 
-#: magnum/common/exception.py:485
+#: magnum/common/exception.py:472
 #, python-format
 msgid "Bay %(bay_name)s already has an operation in progress."
 msgstr ""
 
-#: magnum/common/exception.py:489
+#: magnum/common/exception.py:477
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:493
+#: magnum/common/exception.py:482
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: magnum/common/exception.py:497
+#: magnum/common/exception.py:487
 #, python-format
 msgid "Image %(image_id)s doesn't contain os_distro field."
 msgstr ""
 
-#: magnum/common/exception.py:514
+#: magnum/common/exception.py:505
 #, python-format
 msgid "A key pair %(keypair)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:518
+#: magnum/common/exception.py:509
 #, python-format
 msgid "A key pair with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:522
+#: magnum/common/exception.py:513
 #, python-format
 msgid "Could not store certificate: %(msg)s"
 msgstr ""
 
-#: magnum/common/exception.py:526
+#: magnum/common/exception.py:517
 #, python-format
 msgid "Extension '%(extension)s' not allowed"
 msgstr ""
 
-#: magnum/common/exception.py:530
+#: magnum/common/exception.py:521
 #, python-format
 msgid "Unable to find keypair %(keypair)s."
 msgstr ""
 
-#: magnum/common/exception.py:534
+#: magnum/common/exception.py:525
 #, python-format
 msgid "A magnum service %(magnum_service_id)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:538
+#: magnum/common/exception.py:529
 #, python-format
 msgid "A magnum service with ID %(id)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:542
-msgid "Unsupported memory format for k8s bay."
+#: magnum/common/exception.py:533
+msgid "Unsupported quantity format for k8s bay."
 msgstr ""
 
-#: magnum/common/exception.py:546
+#: magnum/common/exception.py:538
 #, python-format
 msgid "Unable to find flavor %(flavor)s."
 msgstr ""
 
-#: magnum/common/exception.py:550
+#: magnum/common/exception.py:544
 #, python-format
 msgid "Unable to find network %(network)s."
 msgstr ""
 
-#: magnum/common/exception.py:554
+#: magnum/common/exception.py:549
 #, python-format
 msgid "Failed to create trust for trustee %(trustee_user_id)s."
 msgstr ""
 
-#: magnum/common/exception.py:558
+#: magnum/common/exception.py:553
 #, python-format
 msgid "Failed to delete trust %(trust_id)s."
 msgstr ""
 
+#: magnum/common/exception.py:557
+#, python-format
+msgid "Failed to create trustee %(username)s in domain %(domain_id)s"
+msgstr ""
+
+#: magnum/common/exception.py:562
+#, python-format
+msgid "Failed to delete trustee %(trustee_id)s"
+msgstr ""
+
+#: magnum/common/exception.py:566
+#, python-format
+msgid "Quota for project %(project_id)s already exists for resource %(resource)s."
+msgstr ""
+
+#: magnum/common/exception.py:571
+msgid "Failed to list regions."
+msgstr ""
+
+#: magnum/common/exception.py:575
+#, python-format
+msgid "Failed to create trustee or trust for Bay: %(bay_uuid)s"
+msgstr ""
+
+#: magnum/common/exception.py:579
+#, python-format
+msgid "Failed to create certificates for Bay: %(bay_uuid)s"
+msgstr ""
+
 #: magnum/common/k8s_manifest.py:41 magnum/common/k8s_manifest.py:54
 msgid "'manifest' can't be empty"
 msgstr ""
@@ -595,6 +625,35 @@ msgstr ""
 msgid "The manifest is not a JSON object or YAML mapping."
 msgstr ""
 
+#: magnum/common/keystone.py:36
+msgid "Id of the domain to create trustee for bays"
+msgstr ""
+
+#: magnum/common/keystone.py:38
+msgid ""
+"Id of the admin with roles sufficient to manage users in the "
+"trustee_domain"
+msgstr ""
+
+#: magnum/common/keystone.py:41
+msgid "Password of trustee_domain_admin"
+msgstr ""
+
+#: magnum/common/keystone.py:44
+msgid "The roles which are delegated to the trustee by the trustor"
+msgstr ""
+
+#: magnum/common/keystone.py:238
+msgid "region_name needs to be configured in magnum.conf"
+msgstr ""
+
+#: magnum/common/keystone.py:253
+#, python-format
+msgid ""
+"region_name %(region_name)s is invalid, expecting a region_name in "
+"%(region_name_list)s."
+msgstr ""
+
 #: magnum/common/service.py:27
 msgid ""
 "Name of this node. This can be an opaque identifier. It is not "
@@ -622,7 +681,7 @@ msgstr ""
 msgid "Failed to retrieve manifest: %s"
 msgstr ""
 
-#: magnum/common/utils.py:134
+#: magnum/common/utils.py:144
 msgid "Invalid private key"
 msgstr ""
 
@@ -665,78 +724,65 @@ msgstr ""
 msgid "Output key '%(output_key)s' is missing from stack %(stack_id)s"
 msgstr ""
 
-#: magnum/conductor/template_definition.py:42
+#: magnum/conductor/template_definition.py:41
 msgid "Location of template to build a k8s cluster on atomic."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:47
+#: magnum/conductor/template_definition.py:46
 msgid "Location of template to build a k8s cluster on CoreOS."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:51
+#: magnum/conductor/template_definition.py:50
 msgid "Url for etcd public discovery endpoint."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:55
-msgid "coreos discovery token url."
-msgstr ""
-
-#: magnum/conductor/template_definition.py:59
+#: magnum/conductor/template_definition.py:54
 msgid "Location of template to build a swarm cluster on atomic."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:64
+#: magnum/conductor/template_definition.py:59
 msgid "Location of template to build a Mesos cluster on Ubuntu."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:69
+#: magnum/conductor/template_definition.py:64
 msgid "Enabled bay definition entry points."
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:169
-#, python-format
-msgid "cannot change bay property(ies) %s."
-msgstr ""
-
-#: magnum/conductor/handlers/bay_conductor.py:180
+#: magnum/conductor/handlers/bay_conductor.py:168
 #, python-format
 msgid "Updating a bay when stack status is \"%s\""
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:101
+#: magnum/db/sqlalchemy/api.py:100
 #, python-format
 msgid "The sort_key value \"%(key)s\" is an invalid field for sorting"
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:232
+#: magnum/db/sqlalchemy/api.py:231
 msgid "Cannot overwrite UUID for an existing Bay."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:348
+#: magnum/db/sqlalchemy/api.py:359
 msgid "Cannot overwrite UUID for an existing BayModel."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:445
+#: magnum/db/sqlalchemy/api.py:458
 msgid "Cannot overwrite UUID for an existing Container."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:541
-msgid "Cannot overwrite UUID for an existing Node."
-msgstr ""
-
-#: magnum/db/sqlalchemy/api.py:644
+#: magnum/db/sqlalchemy/api.py:553
 msgid "Cannot overwrite UUID for an existing Pod."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:743
+#: magnum/db/sqlalchemy/api.py:652
 msgid "Cannot overwrite UUID for an existing Service."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:840
+#: magnum/db/sqlalchemy/api.py:749
 msgid "Cannot overwrite UUID for an existing rc."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:914
+#: magnum/db/sqlalchemy/api.py:823
 msgid "Cannot overwrite UUID for an existing X509KeyPair."
 msgstr ""
 
@@ -758,12 +804,12 @@ msgstr ""
 msgid "Stack with id %s not found in Heat."
 msgstr ""
 
-#: magnum/tests/unit/common/test_exception.py:22
+#: magnum/tests/unit/common/test_exception.py:23
 #, python-format
 msgid "templated %(name)s"
 msgstr ""
 
-#: magnum/tests/unit/common/test_exception.py:67
+#: magnum/tests/unit/common/test_exception.py:68
 #, python-format
 msgid "custom templated %(name)s"
 msgstr ""
diff --git a/releasenotes/source/locale/releasenotes.pot b/releasenotes/source/locale/releasenotes.pot
new file mode 100644
index 0000000000..9a865a2d11
--- /dev/null
+++ b/releasenotes/source/locale/releasenotes.pot
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2016, Magnum developers
+# This file is distributed under the same license as the Magnum Release Notes package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Magnum Release Notes 2.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-17 06:02+0000\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# 3c86871de11a487da2c3b88c37afd6e7
+#: ../source/index.rst:7
+msgid "Welcome to Magnum Release Notes's documentation!"
+msgstr ""
+
+# 09fc2eb21d6a4838905167ebcc459357
+#: ../source/index.rst:9
+msgid "Contents:"
+msgstr ""
+
+# 7e422ef14c644cfe989a91a6681d94c4
+#: ../source/index.rst:17
+msgid "Indices and tables"
+msgstr ""
+
+# 44c995d7bcb7427c8700e1f8ea56bb8a
+#: ../source/index.rst:19
+msgid ":ref:`genindex`"
+msgstr ""
+
+# 8a33faa8433d4c108d203d3fed2bac91
+#: ../source/index.rst:20
+msgid ":ref:`modindex`"
+msgstr ""
+
+# 875d36137afe48d9b2dd70b2bc02e828
+#: ../source/index.rst:21
+msgid ":ref:`search`"
+msgstr ""
+
+# b51ab76c29f74aea82381a63de49cfb5
+#: ../source/unreleased.rst:3
+msgid "Current Series Release Notes"
+msgstr ""