diff --git a/magnum/locale/ja/LC_MESSAGES/magnum.po b/magnum/locale/ja/LC_MESSAGES/magnum.po
new file mode 100644
index 0000000000..b005d880a5
--- /dev/null
+++ b/magnum/locale/ja/LC_MESSAGES/magnum.po
@@ -0,0 +1,478 @@
+# Shu Muto <shu-mutou@rf.jp.nec.com>, 2015. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: magnum 1.0.0.0b2.dev51\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2015-11-04 06:03+0000\n"
+"PO-Revision-Date: 2015-11-02 09:43+0000\n"
+"Last-Translator: Shu Muto <shu-mutou@rf.jp.nec.com>\n"
+"Language: ja\n"
+"Language-Team: Japanese\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.1.1\n"
+
+#, python-format
+msgid "%(client)s connection failed. %(message)s"
+msgstr "%(client)s の接続が失敗しました。%(message)s"
+
+#, python-format
+msgid "%(err)s"
+msgstr "%(err)s"
+
+#, python-format
+msgid "%(operation)s is not supported."
+msgstr "%(operation)s はサポートされていません。"
+
+#, python-format
+msgid "'%s' is a mandatory attribute and can not be removed"
+msgstr "「%s」は必須属性であり、削除できません"
+
+#, python-format
+msgid "'%s' is an internal attribute and can not be updated"
+msgstr "「%s」は内部属性であり、更新できません"
+
+msgid "'add' and 'replace' operations needs value"
+msgstr "'add' と 'replace' 処理には、値が必要です。"
+
+msgid "'manifest' can't be empty"
+msgstr "「マニフェスト」は空にできません"
+
+#, python-format
+msgid "A ReplicationController with UUID %(uuid)s already exists."
+msgstr "UUID %(uuid)s の複製コントローラーは既に存在します。"
+
+#, python-format
+msgid "A baymodel with UUID %(uuid)s already exists."
+msgstr "UUID %(uuid)s のベイモデルは既に存在します。"
+
+#, python-format
+msgid "A container with UUID %(uuid)s already exists."
+msgstr "UUID %(uuid)s のコンテナーは既に存在します。"
+
+msgid "A datetime.datetime is required here"
+msgstr "datetime.datetimeがここに必要です。"
+
+#, python-format
+msgid "A key pair %(keypair)s could not be found."
+msgstr "キーペア %(keypair)s が見つかりませんでした。"
+
+#, python-format
+msgid "A key pair with UUID %(uuid)s already exists."
+msgstr "UUID %(uuid)s のキーペアは既に存在します。"
+
+#, python-format
+msgid "A magnum service %(magnum_service_id)s could not be found."
+msgstr "Magnumサービス %(magnum_service_id)s が見つかりませんでした。"
+
+#, python-format
+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 クラスのオブジェクトがここに必要です。"
+
+msgid "An unknown exception occurred."
+msgstr "不明な例外が発生しました。"
+
+#, python-format
+msgid "Bay %(bay)s could not be found."
+msgstr "ベイ %(bay)s が見つかりませんでした。"
+
+#, python-format
+msgid "Bay %(bay_name)s already has an operation in progress."
+msgstr "ベイ %(bay_name)s には既に進行中の操作があります。"
+
+#, python-format
+msgid "Bay type (%(server_type)s, %(os)s, %(coe)s) not enabled."
+msgstr "ベイ種別 (%(server_type)s, %(os)s, %(coe)s) が有効になっていません。"
+
+#, python-format
+msgid "Bay type (%(server_type)s, %(os)s, %(coe)s) not supported."
+msgstr "ベイ種別 (%(server_type)s, %(os)s, %(coe)s) はサポートされていません。"
+
+#, python-format
+msgid "Baymodel %(baymodel)s could not be found."
+msgstr "ベイモデル %(baymodel)s が見つかりませんでした。"
+
+#, python-format
+msgid "Baymodel %(baymodel)s is referenced by one or multiple bays."
+msgstr "ベイモデル「%(baymodel)s」は、１つ以上のベイに参照されています。"
+
+#, python-format
+msgid "Cannot call %(method)s on orphaned %(objtype)s object"
+msgstr "孤立 %(objtype)s オブジェクトで %(method)s を呼び出すことはできません"
+
+#, python-format
+msgid "Cannot compile public API routes: %s"
+msgstr "パブリック API ルートをコンパイルできません: %s"
+
+msgid "Cannot overwrite UUID for an existing Bay."
+msgstr "既存のベイの UUID を上書きできません。"
+
+msgid "Cannot overwrite UUID for an existing BayModel."
+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 を上書きできません。"
+
+msgid "Cannot overwrite UUID for an existing Service."
+msgstr "既存のサービスの UUID を上書きできません。"
+
+msgid "Cannot overwrite UUID for an existing X509KeyPair."
+msgstr "既存のX509キーペアの UUID を上書きできません。"
+
+msgid "Cannot overwrite UUID for an existing rc."
+msgstr "既存の複製コントローラーの UUID を上書きできません。"
+
+msgid "Certificate can get the CA flag in x509 extensions."
+msgstr "証明書は x509 拡張のCAフラグを取得できます。"
+
+msgid "Certificate could not be read."
+msgstr "証明書は読み込まれませんでした。"
+
+msgid "Conflict."
+msgstr "競合があります。"
+
+#, python-format
+msgid "Container %(container)s could not be found."
+msgstr "コンテナー %(container)s が見つかりませんでした。"
+
+msgid "Container Orchestration Environments are kubernetes or swarm."
+msgstr "コンテナーオーケストレーション環境は、kubernetes か swarm です。"
+
+#, python-format
+msgid "Could not store certificate: %(msg)s"
+msgstr "証明書を保存出来ませんでした: %(msg)s"
+
+#, python-format
+msgid "Couldn't apply patch '%(patch)s'. Reason: %(reason)s"
+msgstr "パッチ「%(patch)s」を適用できませんでした。理由: %(reason)s"
+
+#, python-format
+msgid "Error parsing manifest: %s"
+msgstr "マニフェストの解析エラー: %s"
+
+#, python-format
+msgid "ErrorDocumentMiddleware received an invalid status %s"
+msgstr "ErrorDocumentMiddleware が無効なステータス %s を受け取りました"
+
+#, python-format
+msgid "Expected a MAC address but received %(mac)s."
+msgstr "MAC アドレスが必要ですが、%(mac)s を受け取りました。"
+
+#, python-format
+msgid "Expected a name but received %(uuid)s."
+msgstr "名前が必要ですが、%(uuid)s を受け取りました。"
+
+#, python-format
+msgid "Expected a name or uuid but received %(uuid)s."
+msgstr "名前かUUID が必要ですが、%(uuid)s を受け取りました。"
+
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
+msgstr "UUID が必要ですが、%(uuid)s を受け取りました。"
+
+#, python-format
+msgid "Expected an uuid or int but received %(identity)s."
+msgstr "UUID または整数が必要ですが、%(identity)s を受け取りました。"
+
+#, python-format
+msgid "Extension '%(extension)s' not allowed"
+msgstr "拡張機能 %(extension)s は許可されていません。"
+
+#, python-format
+msgid "Failed to create a file system. File system %(fs)s is not supported."
+msgstr ""
+"ファイルシステムの作成に失敗しました。ファイルシステム %(fs)s はサポートされ"
+"ていません。"
+
+#, python-format
+msgid "Failed to establish SSH connection to host %(host)s."
+msgstr "ホスト %(host)s への SSH 接続を確立できませんでした。"
+
+#, python-format
+msgid "Failed to retrieve manifest: %s"
+msgstr "マニフェスト %s の取得に失敗しました。"
+
+#, python-format
+msgid ""
+"Field labels list %(labels)s has different number of elements than fields "
+"list %(fields)s"
+msgstr ""
+"フィールドラベルのリスト %(labels)s の要素数がフィールドリスト %(fields)s と"
+"異なります"
+
+msgid "If set, then the server's certificate will not be verified."
+msgstr "設定すると、サーバーの証明書は検査されません。"
+
+#, python-format
+msgid "Image %(image_id)s could not be found."
+msgstr "イメージ %(image_id)s が見つかりませんでした。"
+
+#, python-format
+msgid "Image %(image_id)s doesn't contain os_distro field."
+msgstr "イメージ %(image_id)s は os_distro フィールドを含んでいません。"
+
+#, python-format
+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 は無効です"
+
+#, python-format
+msgid "Invalid UUID version (%d)"
+msgstr "UUID バージョン (%d) は無効です"
+
+#, python-format
+msgid "Invalid configuration file. %(error_msg)s"
+msgstr "設定ファイルが無効です。%(error_msg)s"
+
+msgid "Invalid private key"
+msgstr "無効な秘密鍵"
+
+msgid "Invalid resource state."
+msgstr "リソース状態が無効です。"
+
+#, python-format
+msgid "Invalid sort direction: %s. Acceptable values are 'asc' or 'desc'"
+msgstr "%s は無効なソート方向です。「asc」または「desc」が有効です。"
+
+#, python-format
+msgid "Invalid value for %s header"
+msgstr "無効な %s ヘッダーの値"
+
+msgid "Limit must be positive"
+msgstr "上限は正の値でなければなりません"
+
+#, python-format
+msgid "List of allowed x509 extensions. Available values: %s"
+msgstr "許可された x509 拡張の一覧です。利用できる値: %s"
+
+#, python-format
+msgid "List of allowed x509 key usage. Available values: %s"
+msgstr "許可された x509 鍵の利用方法の一覧です。利用できる値: %s"
+
+msgid "Location of template to build a Mesos cluster on Ubuntu."
+msgstr "MesosクラスタをUbuntu上に構築するためのテンプレートの場所"
+
+msgid "Location of template to build a k8s cluster on CoreOS."
+msgstr "k8sクラスタをCoreOS上に構築するためのテンプレートの場所"
+
+msgid "Location of template to build a k8s cluster on atomic."
+msgstr "k8sクラスタをatomic上に構築するためのテンプレートの場所"
+
+msgid "Location of template to build a swarm cluster on atomic."
+msgstr "swarmクラスタをatomic上に構築するためのテンプレートの場所"
+
+msgid "Maximum raw byte size of any manifest."
+msgstr "マニフェストの最大容量、元のバイト単位。"
+
+#, python-format
+msgid "Missing arguments: %s"
+msgstr "引数 %s がありません"
+
+#, python-format
+msgid ""
+"Mutually exclusive versions requested. Version %(ver)s requested but not "
+"supported by this service.The supported version range is: [%(min)s, %(max)s]."
+msgstr ""
+"相互排他的なバージョンが要求されました。バージョン %(ver)s が要求されました"
+"が、このサービスではサポートされていません。サポートされるバージョンの範囲は "
+"[%(min)s、%(max)s] です。"
+
+msgid ""
+"Name of this node. This can be an opaque identifier. It is not necessarily a "
+"hostname, FQDN, or IP address. However, the node name must be valid within "
+"an AMQP key, and if using ZeroMQ, a valid hostname, FQDN, or IP address."
+msgstr ""
+"このノードの名前。これには不透明な ID を指定できます。この名前はホスト名、"
+"FQDN、または IP アドレスとは限りません。ただし、ノード名はAMQP鍵の中で有効で"
+"あり、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 では許可されていません。"
+
+msgid "Not authorized to set public flag for baymodel."
+msgstr "ベイモデルへの公開フラグの設定は許可されていません。"
+
+msgid "Not authorized."
+msgstr "権限がありません。"
+
+msgid "Number of days for which a certificate is valid."
+msgstr "証明書が利用可能な日数です。"
+
+msgid "Optional CA cert file to use in SSL connections."
+msgstr "SSL 接続に使用する CA 証明書ファイル。オプション。"
+
+msgid "Optional PEM-formatted certificate chain file."
+msgstr "PEM 形式の証明書チェーンファイル。オプション。"
+
+msgid "Optional PEM-formatted file that contains the private key."
+msgstr "秘密鍵を含む PEM ファイル。オプション。"
+
+#, python-format
+msgid "Output key '%(output_key)s' is missing from stack %(stack_id)s"
+msgstr ""
+"出力された鍵「%(output_key)s」は、スタック「%(stack_id)s」から見つかりませ"
+"ん。"
+
+#, python-format
+msgid "Pod %(pod)s could not be found."
+msgstr "ポッド %(pod)s が見つかりませんでした。"
+
+msgid "Private Key could not be read."
+msgstr "秘密鍵は読み込まれませんでした。"
+
+#, python-format
+msgid ""
+"Received invalid discovery URL '%(discovery_url)s' for discovery endpoint "
+"'%(discovery_endpoint)s'."
+msgstr ""
+"無効なディスカバリーURL「%(discovery_url)s」をディスカバリーエンドポイント"
+"「%(discovery_endpoint)s」のために受け取りました。"
+
+msgid ""
+"Region in Identity service catalog to use for communication with the "
+"OpenStack service."
+msgstr ""
+"OpenStack サービスとの通信に使用する Identity サービスカタログ内のリージョ"
+"ン。"
+
+#, python-format
+msgid "ReplicationController %(rc)s could not be found."
+msgstr "複製コントローラー %(rc)s が見つかりませんでした。"
+
+msgid "Request not acceptable."
+msgstr "要求は受け入れられませんでした。"
+
+#, python-format
+msgid "Required parameter %(heat_param)s not provided."
+msgstr "必須のパラメータ %(heat_param)s が指定されませんでした。"
+
+msgid "Retrieved Barbican Container is not of the correct type (certificate)."
+msgstr "取得したBarbican コンテナーは、正しい種別（証明書）ではありません。"
+
+#, python-format
+msgid "Service %(service)s could not be found."
+msgstr "サービス %(service)s が見つかりませんでした。"
+
+msgid "Size of generated private key. "
+msgstr "生成された秘密鍵のサイズ"
+
+#, python-format
+msgid "Stack with id %s not found in Heat."
+msgstr "ID %s のスタックがHeatに見つかりません"
+
+#, python-format
+msgid "The %(name)s %(id)s could not be found."
+msgstr "%(name)s %(id)s が見つかりませんでした"
+
+#, python-format
+msgid "The %(name)s already exists."
+msgstr "%(name)s は既に存在します。"
+
+#, python-format
+msgid "The %(name)s resource %(id)s could not be found."
+msgstr "リソース %(name)s %(id)s が見つかりませんでした"
+
+#, python-format
+msgid "The %(name)s resource already exists."
+msgstr "リソース %(name)s は既に存在します。"
+
+msgid "The manifest is not a JSON object or YAML mapping."
+msgstr "マニフェストが JSON オブジェクトでも YAML マッピングでもありません。"
+
+#, python-format
+msgid "The sort_key value \"%(key)s\" is an invalid field for sorting"
+msgstr "sort_key の値「%(key)s」が、並び替えでは使用できないフィールドです"
+
+#, python-format
+msgid "The urllib2 URL %(url)s has an invalid scheme."
+msgstr "urllib2 の URL %(url)s はスキームが無効です。"
+
+msgid ""
+"Type of endpoint in Identity service catalog to use for communication with "
+"the OpenStack service."
+msgstr ""
+"OpenStack サービスとの通信に使用する Identity サービスカタログ内のエンドポイ"
+"ント種別。"
+
+#, python-format
+msgid "Unable to find keypair %(keypair)s."
+msgstr "キーペア「%(keypair)s」が見つかりません。"
+
+msgid "Unacceptable parameters."
+msgstr "受け入れられないパラメーター。"
+
+#, python-format
+msgid "Unsupported object type %(objtype)s"
+msgstr "サポートされないオブジェクト種別 %(objtype)s"
+
+#, python-format
+msgid "Updating a bay when stack status is \"%s\""
+msgstr "スタックの状況が「%s」の時に、ベイを更新しています。"
+
+#, python-format
+msgid "Version %(objver)s of %(objname)s is not supported"
+msgstr "バージョン %(objver)s の %(objname)s はサポートされません"
+
+#, python-format
+msgid ""
+"Version %(ver)s was requested but the minor version is not supported by this "
+"service. The supported version range is: [%(min)s, %(max)s]."
+msgstr ""
+"バージョン %(ver)s が要求されましたが、このサービスでは、マイナーバージョンは"
+"サポートされていません。サポートされるバージョン範囲は [%(min)s、%(max)s] で"
+"す。"
+
+#, python-format
+msgid "Wrong type. Expected '%(type)s', got '%(value)s'"
+msgstr ""
+"種別が正しくありません。「%(type)s」 が期待値でしたが、「%(value)s」が取得さ"
+"れました。"
+
+#, python-format
+msgid "cannot change bay property(ies) %s."
+msgstr "ベイのプロパティ %s を変更できません。"
+
+#, python-format
+msgid "custom templated %(name)s"
+msgstr "カスタムテンプレート化された %(name)s"
+
+#, python-format
+msgid "templated %(name)s"
+msgstr "テンプレート化された %(name)s"
diff --git a/magnum/locale/magnum-log-critical.pot b/magnum/locale/magnum-log-critical.pot
deleted file mode 100644
index 958e9716eb..0000000000
--- a/magnum/locale/magnum-log-critical.pot
+++ /dev/null
@@ -1,19 +0,0 @@
-# Translations template for magnum.
-# Copyright (C) 2015 ORGANIZATION
-# This file is distributed under the same license as the magnum project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: magnum 2015.1.1.dev100\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-28 09:18+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
-
diff --git a/magnum/locale/magnum-log-error.pot b/magnum/locale/magnum-log-error.pot
index 9b13c4ff4d..8e1a364230 100644
--- a/magnum/locale/magnum-log-error.pot
+++ b/magnum/locale/magnum-log-error.pot
@@ -6,23 +6,23 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 2015.1.1.dev100\n"
+"Project-Id-Version: magnum 1.0.0.0b2.dev51\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-28 09:18+0200\n"
+"POT-Creation-Date: 2015-11-04 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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.1.1\n"
 
-#: magnum/api/middleware/parsable_error.py:77
+#: magnum/api/controllers/v1/container.py:297
 #, python-format
-msgid "Error parsing HTTP response: %s"
+msgid "Error while list container %(uuid)s: %(e)s."
 msgstr ""
 
-#: magnum/cmd/conductor.py:56
+#: magnum/cmd/conductor.py:67
 #, python-format
 msgid ""
 "The Heat template can not be found for either k8s atomic "
@@ -30,138 +30,98 @@ msgid ""
 " if you want to create bay."
 msgstr ""
 
-#: magnum/common/exception.py:128
+#: magnum/common/exception.py:122
 #, python-format
 msgid "%(correlation_id)s:%(excp)s"
 msgstr ""
 
-#: magnum/common/exception.py:216
-msgid "Exception in string format operation"
-msgstr ""
-
-#: magnum/common/exception.py:218
+#: magnum/common/exception.py:207
 #, python-format
-msgid "%(name)s: %(value)s"
+msgid "Exception in string format operation, kwargs: %s"
 msgstr ""
 
-#: magnum/common/magnum_keystoneclient.py:89
-msgid "Admin client authentication failed"
-msgstr ""
-
-#: magnum/common/magnum_keystoneclient.py:119
+#: magnum/common/keystone.py:101
 msgid "Unknown version in auth_token_info"
 msgstr ""
 
-#: magnum/common/magnum_keystoneclient.py:125
-msgid "Keystone v3 API connection failed, no password trust or auth_token!"
+#: magnum/common/keystone.py:106
+msgid "Keystone v3 API conntection failed, no password trust or auth_token"
 msgstr ""
 
-#: magnum/common/magnum_keystoneclient.py:136
-msgid "trust token re-scoping failed!"
-msgstr ""
-
-#: magnum/common/utils.py:397
+#: magnum/common/utils.py:345
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: magnum/common/utils.py:428
+#: magnum/common/utils.py:376
 #, python-format
 msgid "Failed to make file system. File system %s is not supported."
 msgstr ""
 
-#: magnum/common/utils.py:432
+#: magnum/common/utils.py:380
 #, python-format
 msgid "Failed to create a file system in %(path)s. Error: %(error)s"
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:234
-#, python-format
-msgid "Unable to create bay, stack_id: %(stack_id)s, reason: %(reason)s"
+#: magnum/common/cert_manager/barbican_cert_manager.py:153
+msgid "Error storing certificate data"
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:240
-#, python-format
-msgid "Unable to delete bay, stack_id: %(stack_id)s, reason: %(reason)s"
+#: magnum/common/cert_manager/barbican_cert_manager.py:188
+msgid "Error getting {0}"
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:246
-#, python-format
-msgid "Unable to update bay, stack_id: %(stack_id)s, reason: %(reason)s"
+#: magnum/common/cert_manager/barbican_cert_manager.py:214
+msgid "Error deregistering as a consumer of {0}"
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:257
-#: magnum/conductor/handlers/bay_conductor.py:265
+#: magnum/common/cert_manager/barbican_cert_manager.py:241
+msgid "Error recursively deleting certificate container {0}"
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:115
+msgid "Failed to store certificate."
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:148
+msgid "Failed to read certificate for {0}."
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:158
+msgid "Failed to read private key for {0}."
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:170
+#: magnum/common/cert_manager/local_cert_manager.py:178
+msgid "Failed to read certificate."
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:211
+msgid "Failed to delete certificate {0}."
+msgstr ""
+
+#: magnum/conductor/handlers/bay_conductor.py:251
+#: magnum/conductor/handlers/bay_conductor.py:259
 #, python-format
 msgid ""
 "Bay check exit after %(attempts)s attempts,stack_id: %(id)s, "
 "stack_status: %(status)s"
 msgstr ""
 
-#: magnum/conductor/handlers/docker_conductor.py:64
+#: magnum/conductor/handlers/bay_conductor.py:295
+#, 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:35
 #, python-format
 msgid "Error while connect to docker container %(name)s: %(error)s"
 msgstr ""
 
-#: magnum/conductor/handlers/common/kube_utils.py:89
+#: magnum/conductor/handlers/docker_conductor.py:112
 #, python-format
-msgid "Couldn't create service with contents %(content)s due to error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:103
-#, python-format
-msgid "Couldn't update service with contents %(content)s due to error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:117
-#, python-format
-msgid "Couldn't delete service %(service)s due to error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:131
-#, python-format
-msgid "Couldn't create pod with contents %(content)s due to error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:145
-#, python-format
-msgid "Couldn't update pod with %(content)s due to error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:156
-#, python-format
-msgid "Couldn't delete pod %(pod)s due to error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:177
-#, python-format
-msgid "Couldn't create rc with contents %(content)s due error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:190
-#, python-format
-msgid "Couldn't update rc with contents %(content)s due to error %(error)s"
-msgstr ""
-
-#: magnum/conductor/handlers/common/kube_utils.py:203
-#, python-format
-msgid "Couldn't delete rc %(rc)s due to error %(error)s"
-msgstr ""
-
-#: magnum/openstack/common/loopingcall.py:95
-msgid "in fixed duration looping call"
-msgstr ""
-
-#: magnum/openstack/common/loopingcall.py:138
-msgid "in dynamic looping call"
-msgstr ""
-
-#: magnum/openstack/common/periodic_task.py:228
-#, python-format
-msgid "Error during %(full_task_name)s: %(e)s"
-msgstr ""
-
-#: magnum/openstack/common/service.py:272
-msgid "Unhandled exception"
+msgid "Can not find docker instance with %s,set it to Error status"
 msgstr ""
 
diff --git a/magnum/locale/magnum-log-info.pot b/magnum/locale/magnum-log-info.pot
index 688e34435c..fa2bda9c30 100644
--- a/magnum/locale/magnum-log-info.pot
+++ b/magnum/locale/magnum-log-info.pot
@@ -6,42 +6,57 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 2015.1.1.dev100\n"
+"Project-Id-Version: magnum 1.0.0.0b2.dev51\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-28 09:18+0200\n"
+"POT-Creation-Date: 2015-11-04 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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.1.1\n"
 
-#: magnum/cmd/api.py:42 magnum/cmd/conductor.py:40
+#: magnum/cmd/api.py:50 magnum/cmd/conductor.py:48
 #, python-format
 msgid "Starting server in PID %s"
 msgstr ""
 
-#: magnum/cmd/api.py:47
+#: 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:51
+#: magnum/cmd/api.py:59
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr ""
 
-#: magnum/common/magnum_keystoneclient.py:156
-#, python-format
-msgid "admin creds %s"
-msgstr ""
-
 #: magnum/common/urlfetch.py:49
 #, python-format
 msgid "Fetching data from %s"
 msgstr ""
 
+#: magnum/common/cert_manager/barbican_cert_manager.py:91
+msgid "Storing certificate container '{0}' in Barbican."
+msgstr ""
+
+#: magnum/common/cert_manager/barbican_cert_manager.py:144
+msgid "Deleted secret {0} ({1}) during rollback."
+msgstr ""
+
+#: magnum/common/cert_manager/barbican_cert_manager.py:171
+msgid "Loading certificate container {0} from Barbican."
+msgstr ""
+
+#: magnum/common/cert_manager/barbican_cert_manager.py:203
+msgid "Deregistering as a consumer of {0} in Barbican."
+msgstr ""
+
+#: magnum/common/cert_manager/barbican_cert_manager.py:227
+msgid "Recursively deleting certificate container {0} from Barbican."
+msgstr ""
+
 #: magnum/conductor/bay_lock.py:75
 #, python-format
 msgid ""
@@ -68,80 +83,44 @@ msgid ""
 "lock first"
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:186
+#: magnum/conductor/scale_manager.py:70
+#, python-format
+msgid "Require removal of hosts: %s"
+msgstr ""
+
+#: magnum/conductor/handlers/bay_conductor.py:190
 #, python-format
 msgid "The stack %s was not be found during bay deletion."
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:219
+#: magnum/conductor/handlers/bay_conductor.py:196
+#: magnum/conductor/handlers/bay_conductor.py:273
+#: magnum/service/periodic.py:141
+#, python-format
+msgid "The bay %s has been deleted by others."
+msgstr ""
+
+#: magnum/conductor/handlers/bay_conductor.py:267
 #, python-format
 msgid "Bay has been deleted, stack_id: %s"
 msgstr ""
 
-#: magnum/openstack/common/eventlet_backdoor.py:146
+#: magnum/service/periodic.py:124
 #, python-format
-msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgid "Sync up bay with id %(id)s from %(old_status)s to %(status)s."
 msgstr ""
 
-#: magnum/openstack/common/periodic_task.py:120
+#: magnum/service/periodic.py:143
 #, python-format
-msgid "Skipping periodic task %(task)s because its interval is negative"
+msgid ""
+"Bay with id %(id)s not found in heat with stack id %(sid)s, with "
+"status_reason: %(reason)."
 msgstr ""
 
-#: magnum/openstack/common/periodic_task.py:125
+#: magnum/service/periodic.py:153
 #, python-format
-msgid "Skipping periodic task %(task)s because it is disabled"
-msgstr ""
-
-#: magnum/openstack/common/service.py:173
-#, python-format
-msgid "Caught %s, exiting"
-msgstr ""
-
-#: magnum/openstack/common/service.py:235
-msgid "Parent process has died unexpectedly, exiting"
-msgstr ""
-
-#: magnum/openstack/common/service.py:266
-#, python-format
-msgid "Child caught %s, exiting"
-msgstr ""
-
-#: magnum/openstack/common/service.py:305
-msgid "Forking too fast, sleeping"
-msgstr ""
-
-#: magnum/openstack/common/service.py:324
-#, python-format
-msgid "Started child %d"
-msgstr ""
-
-#: magnum/openstack/common/service.py:334
-#, python-format
-msgid "Starting %d workers"
-msgstr ""
-
-#: magnum/openstack/common/service.py:351
-#, python-format
-msgid "Child %(pid)d killed by signal %(sig)d"
-msgstr ""
-
-#: magnum/openstack/common/service.py:355
-#, python-format
-msgid "Child %(pid)s exited with status %(code)d"
-msgstr ""
-
-#: magnum/openstack/common/service.py:390
-#, python-format
-msgid "Caught %s, stopping children"
-msgstr ""
-
-#: magnum/openstack/common/service.py:399
-msgid "Wait called after thread killed. Cleaning up."
-msgstr ""
-
-#: magnum/openstack/common/service.py:415
-#, python-format
-msgid "Waiting on %d children to exit"
+msgid ""
+"Bay with id %(id)s has been set to %(status)s due to stack with id "
+"%(sid)s not found in Heat."
 msgstr ""
 
diff --git a/magnum/locale/magnum-log-warning.pot b/magnum/locale/magnum-log-warning.pot
index 35f07906fc..620e903137 100644
--- a/magnum/locale/magnum-log-warning.pot
+++ b/magnum/locale/magnum-log-warning.pot
@@ -6,51 +6,103 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 2015.1.1.dev100\n"
+"Project-Id-Version: magnum 1.0.0.0b2.dev51\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-28 09:18+0200\n"
+"POT-Creation-Date: 2015-11-04 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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.1.1\n"
 
-#: magnum/common/utils.py:444
+#: magnum/common/utils.py:392
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: magnum/common/utils.py:453
+#: magnum/common/utils.py:401
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: magnum/common/utils.py:469
+#: magnum/common/utils.py:417
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: magnum/common/utils.py:483
+#: magnum/common/utils.py:431
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
 "object is not a string: %s,"
 msgstr ""
 
+#: magnum/common/cert_manager/barbican_cert_manager.py:148
+msgid ""
+"Failed to delete {0} ({1}) during rollback. This is probably not a "
+"problem."
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:92
+msgid ""
+"Storing certificate data on the local filesystem. CertManager type "
+"'local' should be used for testing purpose."
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:130
+msgid ""
+"Loading certificate {0} from the local filesystem. CertManager type "
+"'local' should be used for testing purpose."
+msgstr ""
+
+#: magnum/common/cert_manager/local_cert_manager.py:191
+msgid ""
+"Deleting certificate {0} from the local filesystem. CertManager type "
+"'local' should be used for testing purpose."
+msgstr ""
+
 #: magnum/conductor/bay_lock.py:111
 #, python-format
 msgid "Lock was already released on bay %s!"
 msgstr ""
 
-#: magnum/openstack/common/loopingcall.py:87
+#: magnum/conductor/monitors.py:95
 #, python-format
-msgid "task %(func_name)r run outlasted interval by %(delay).2f sec"
+msgid "Ignore error [%(e)s] when inspecting container %(container_id)s."
 msgstr ""
 
-#: magnum/openstack/common/service.py:359
+#: magnum/conductor/scale_manager.py:61
 #, python-format
-msgid "pid %d not in child list"
+msgid ""
+"About to remove %(num_removal)d nodes, which is larger than the number of"
+" empty nodes (%(num_empty)d). %(num_non_empty)d non-empty nodes will be "
+"removed."
+msgstr ""
+
+#: magnum/conductor/template_definition.py:154
+#, python-format
+msgid "stack does not have output_key %s"
+msgstr ""
+
+#: magnum/conductor/handlers/common/cert_manager.py:153
+#, python-format
+msgid "Deleting cert is failed: %s"
+msgstr ""
+
+#: magnum/service/periodic.py:115
+#, python-format
+msgid "Ignore error [%s] when syncing up bay status."
+msgstr ""
+
+#: magnum/service/periodic.py:175
+#, python-format
+msgid "Skip pulling data from bay %(bay)s due to error: %(e)s"
+msgstr ""
+
+#: magnum/service/periodic.py:190
+#, python-format
+msgid "Skip adding metric %(name)s due to error: %(e)s"
 msgstr ""
 
diff --git a/magnum/locale/magnum.pot b/magnum/locale/magnum.pot
index 7e60bfe9a7..8cbafd4a50 100644
--- a/magnum/locale/magnum.pot
+++ b/magnum/locale/magnum.pot
@@ -6,33 +6,53 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: magnum 2015.1.1.dev100\n"
+"Project-Id-Version: magnum 1.0.0.0b2.dev51\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-28 09:18+0200\n"
+"POT-Creation-Date: 2015-11-04 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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.1.1\n"
 
-#: magnum/api/controllers/v1/types.py:149
+#: magnum/api/controllers/base.py:103
+#, python-format
+msgid "Invalid value for %s header"
+msgstr ""
+
+#: magnum/api/controllers/v1/__init__.py:212
+#, python-format
+msgid ""
+"Mutually exclusive versions requested. Version %(ver)s requested but not "
+"supported by this service.The supported version range is: [%(min)s, "
+"%(max)s]."
+msgstr ""
+
+#: magnum/api/controllers/v1/__init__.py:222
+#, python-format
+msgid ""
+"Version %(ver)s was requested but the minor version is not supported by "
+"this service. The supported version range is: [%(min)s, %(max)s]."
+msgstr ""
+
+#: magnum/api/controllers/v1/types.py:125
 #, python-format
 msgid "Wrong type. Expected '%(type)s', got '%(value)s'"
 msgstr ""
 
-#: magnum/api/controllers/v1/types.py:192
+#: magnum/api/controllers/v1/types.py:169
 #, python-format
 msgid "'%s' is an internal attribute and can not be updated"
 msgstr ""
 
-#: magnum/api/controllers/v1/types.py:196
+#: magnum/api/controllers/v1/types.py:173
 #, python-format
 msgid "'%s' is a mandatory attribute and can not be removed"
 msgstr ""
 
-#: magnum/api/controllers/v1/types.py:201
+#: magnum/api/controllers/v1/types.py:178
 msgid "'add' and 'replace' operations needs value"
 msgstr ""
 
@@ -45,307 +65,367 @@ msgstr ""
 msgid "Invalid sort direction: %s. Acceptable values are 'asc' or 'desc'"
 msgstr ""
 
-#: magnum/api/controllers/v1/utils.py:53
+#: magnum/api/controllers/v1/utils.py:54
 #, python-format
-msgid "Adding a new attribute (%s) to the root of  the resource is not allowed"
+msgid "Adding a new attribute %s to the root of the resource is not allowed."
 msgstr ""
 
-#: magnum/api/middleware/auth_token.py:39
+#: magnum/api/controllers/v1/utils.py:58
+#, python-format
+msgid "The attribute %s has existed, please use 'replace' operation instead."
+msgstr ""
+
+#: magnum/api/middleware/auth_token.py:41
 #, python-format
 msgid "Cannot compile public API routes: %s"
 msgstr ""
 
-#: magnum/api/middleware/parsable_error.py:49
+#: magnum/api/middleware/parsable_error.py:46
 #, python-format
 msgid "ErrorDocumentMiddleware received an invalid status %s"
 msgstr ""
 
-#: magnum/common/clients.py:31 magnum/common/clients.py:53
+#: magnum/common/clients.py:33 magnum/common/clients.py:44
+#: magnum/common/clients.py:66 magnum/common/clients.py:77
+#: magnum/common/clients.py:88
 msgid ""
 "Region in Identity service catalog to use for communication with the "
 "OpenStack service."
 msgstr ""
 
-#: magnum/common/clients.py:35 magnum/common/clients.py:57
+#: magnum/common/clients.py:37 magnum/common/clients.py:48
+#: magnum/common/clients.py:70 magnum/common/clients.py:81
+#: magnum/common/clients.py:92
 msgid ""
 "Type of endpoint in Identity service catalog to use for communication "
 "with the OpenStack service."
 msgstr ""
 
-#: magnum/common/clients.py:39
+#: magnum/common/clients.py:52
 msgid "Optional CA cert file to use in SSL connections."
 msgstr ""
 
-#: magnum/common/clients.py:41
+#: magnum/common/clients.py:54
 msgid "Optional PEM-formatted certificate chain file."
 msgstr ""
 
-#: magnum/common/clients.py:43
+#: magnum/common/clients.py:56
 msgid "Optional PEM-formatted file that contains the private key."
 msgstr ""
 
-#: magnum/common/clients.py:47
+#: magnum/common/clients.py:60
 msgid "If set, then the server's certificate will not be verified."
 msgstr ""
 
-#: magnum/common/exception.py:98
+#: magnum/common/exception.py:92
 #, python-format
 msgid ""
 "Your request could not be handled because of a problem in the server. "
 "Error Correlation id is: %s"
 msgstr ""
 
-#: magnum/common/exception.py:196
+#: magnum/common/exception.py:190
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: magnum/common/exception.py:246
+#: magnum/common/exception.py:235
 #, python-format
 msgid "The %(name)s %(id)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:250
+#: magnum/common/exception.py:239
 #, python-format
 msgid "The %(name)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:254
+#: magnum/common/exception.py:243
 #, python-format
 msgid "The %(name)s resource %(id)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:259
+#: magnum/common/exception.py:248
 #, python-format
 msgid "The %(name)s resource already exists."
 msgstr ""
 
-#: magnum/common/exception.py:264
+#: magnum/common/exception.py:253
 #, python-format
 msgid "%(client)s connection failed. %(message)s"
 msgstr ""
 
-#: magnum/common/exception.py:268
+#: magnum/common/exception.py:257
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: magnum/common/exception.py:272
+#: magnum/common/exception.py:261
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: magnum/common/exception.py:276
+#: magnum/common/exception.py:265
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: magnum/common/exception.py:280
+#: magnum/common/exception.py:269
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: magnum/common/exception.py:285
+#: magnum/common/exception.py:274
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:289
+#: magnum/common/exception.py:278
 #, python-format
 msgid "Expected a name but received %(uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:293
+#: magnum/common/exception.py:282
+#, python-format
+msgid ""
+"Received invalid discovery URL '%(discovery_url)s' for discovery endpoint"
+" '%(discovery_endpoint)s'."
+msgstr ""
+
+#: magnum/common/exception.py:287
 #, python-format
 msgid "Expected a name or uuid but received %(uuid)s."
 msgstr ""
 
-#: magnum/common/exception.py:297
+#: magnum/common/exception.py:291
 #, python-format
 msgid "Expected an uuid or int but received %(identity)s."
 msgstr ""
 
-#: magnum/common/exception.py:305
+#: magnum/common/exception.py:299
 msgid "Conflict."
 msgstr ""
 
-#: magnum/common/exception.py:310
+#: magnum/common/exception.py:304
 msgid "Invalid resource state."
 msgstr ""
 
-#: magnum/common/exception.py:316
+#: magnum/common/exception.py:310
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: magnum/common/exception.py:320
+#: magnum/common/exception.py:314
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s is already associated with a node, it cannot "
 "be associated with this other node %(node)s"
 msgstr ""
 
-#: magnum/common/exception.py:325
+#: magnum/common/exception.py:319
 #, python-format
 msgid "Instance %(instance)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:329
+#: magnum/common/exception.py:323
 #, python-format
 msgid "Couldn't apply patch '%(patch)s'. Reason: %(reason)s"
 msgstr ""
 
-#: magnum/common/exception.py:333
+#: magnum/common/exception.py:327
 msgid "Not authorized."
 msgstr ""
 
-#: magnum/common/exception.py:338
-msgid "Operation not permitted."
+#: magnum/common/exception.py:334
+msgid "Request not acceptable."
 msgstr ""
 
-#: magnum/common/exception.py:342
+#: magnum/common/exception.py:339
 #, python-format
 msgid "Expected a MAC address but received %(mac)s."
 msgstr ""
 
-#: magnum/common/exception.py:346
+#: magnum/common/exception.py:343
 #, python-format
 msgid "Invalid configuration file. %(error_msg)s"
 msgstr ""
 
-#: magnum/common/exception.py:350 magnum/common/exception.py:387
-#: magnum/common/exception.py:403 magnum/common/exception.py:419
+#: magnum/common/exception.py:347 magnum/common/exception.py:388
+#: magnum/common/exception.py:404 magnum/common/exception.py:420
 #, python-format
 msgid "A node with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:354
+#: magnum/common/exception.py:351
 #, python-format
 msgid "Node %(node)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:358
+#: magnum/common/exception.py:355
 #, python-format
 msgid "Node %(node)s is associated with instance %(instance)s."
 msgstr ""
 
-#: magnum/common/exception.py:362
+#: magnum/common/exception.py:359
 #, python-format
 msgid "Failed to establish SSH connection to host %(host)s."
 msgstr ""
 
-#: magnum/common/exception.py:366
+#: magnum/common/exception.py:363
 #, python-format
 msgid "Failed to create a file system. File system %(fs)s is not supported."
 msgstr ""
 
-#: magnum/common/exception.py:371
+#: magnum/common/exception.py:368
 #, python-format
 msgid "Baymodel %(baymodel)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:375
+#: magnum/common/exception.py:372
 #, python-format
 msgid "A baymodel with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:379
+#: magnum/common/exception.py:376
 #, python-format
 msgid "Baymodel %(baymodel)s is referenced by one or multiple bays."
 msgstr ""
 
-#: magnum/common/exception.py:383
+#: magnum/common/exception.py:380
+msgid "Not authorized to set public flag for baymodel."
+msgstr ""
+
+#: magnum/common/exception.py:384
 #, python-format
 msgid "Bay %(bay)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:391
+#: magnum/common/exception.py:392
 #, python-format
 msgid "Container %(container)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:395
+#: magnum/common/exception.py:396
 #, python-format
 msgid "A container with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:399
+#: magnum/common/exception.py:400
 #, python-format
 msgid "Pod %(pod)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:407
+#: magnum/common/exception.py:408
 #, python-format
 msgid "ReplicationController %(rc)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:411
+#: magnum/common/exception.py:412
 #, python-format
 msgid "A ReplicationController with UUID %(uuid)s already exists."
 msgstr ""
 
-#: magnum/common/exception.py:415
+#: magnum/common/exception.py:416
 #, python-format
 msgid "Service %(service)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:427
+#: magnum/common/exception.py:428
 #, python-format
 msgid "%(operation)s is not supported."
 msgstr ""
 
-#: magnum/common/exception.py:432
+#: magnum/common/exception.py:433
 #, python-format
-msgid "Bay type (%(platform)s, %(os)s, %(coe)s) not supported."
+msgid "Bay type (%(server_type)s, %(os)s, %(coe)s) not supported."
 msgstr ""
 
-#: magnum/common/exception.py:436
+#: magnum/common/exception.py:438
 #, python-format
-msgid "Bay type (%(platform)s, %(os)s, %(coe)s) not enabled."
+msgid "Bay type (%(server_type)s, %(os)s, %(coe)s) not enabled."
 msgstr ""
 
-#: magnum/common/exception.py:440
+#: magnum/common/exception.py:443
 #, python-format
 msgid "Required parameter %(heat_param)s not provided."
 msgstr ""
 
-#: magnum/common/exception.py:444
+#: magnum/common/exception.py:447
+#, python-format
 msgid "The urllib2 URL %(url)s has an invalid scheme."
 msgstr ""
 
-#: magnum/common/exception.py:448
+#: magnum/common/exception.py:451
 #, python-format
 msgid "Bay %(bay_name)s already has an operation in progress."
 msgstr ""
 
-#: magnum/common/exception.py:452
+#: magnum/common/exception.py:455
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: magnum/common/exception.py:456
+#: magnum/common/exception.py:459
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: magnum/common/exception.py:460
+#: magnum/common/exception.py:463
 #, python-format
 msgid "Image %(image_id)s doesn't contain os_distro field."
 msgstr ""
 
-#: magnum/common/k8s_manifest.py:40 magnum/common/k8s_manifest.py:53
+#: magnum/common/exception.py:480
+#, python-format
+msgid "A key pair %(keypair)s could not be found."
+msgstr ""
+
+#: magnum/common/exception.py:484
+#, python-format
+msgid "A key pair with UUID %(uuid)s already exists."
+msgstr ""
+
+#: magnum/common/exception.py:488
+#, python-format
+msgid "Could not store certificate: %(msg)s"
+msgstr ""
+
+#: magnum/common/exception.py:492
+#, python-format
+msgid "Extension '%(extension)s' not allowed"
+msgstr ""
+
+#: magnum/common/exception.py:496
+#, python-format
+msgid "Unable to find keypair %(keypair)s."
+msgstr ""
+
+#: magnum/common/exception.py:500
+#, python-format
+msgid "A magnum service %(magnum_service_id)s could not be found."
+msgstr ""
+
+#: magnum/common/exception.py:504
+#, python-format
+msgid "A magnum service with ID %(id)s already exists."
+msgstr ""
+
+#: magnum/common/k8s_manifest.py:41 magnum/common/k8s_manifest.py:54
 msgid "'manifest' can't be empty"
 msgstr ""
 
-#: magnum/common/k8s_manifest.py:49
+#: magnum/common/k8s_manifest.py:50
 #, python-format
 msgid "Error parsing manifest: %s"
 msgstr ""
 
-#: magnum/common/k8s_manifest.py:57
+#: magnum/common/k8s_manifest.py:58
 msgid "The manifest is not a JSON object or YAML mapping."
 msgstr ""
 
-#: magnum/common/magnum_keystoneclient.py:34
-msgid "Subset of trustor roles to be delegated to magnum."
+#: magnum/common/service.py:27
+msgid ""
+"Name of this node. This can be an opaque identifier. It is not "
+"necessarily a hostname, FQDN, or IP address. However, the node name must "
+"be valid within an AMQP key, and if using ZeroMQ, a valid hostname, FQDN,"
+" or IP address."
 msgstr ""
 
 #: magnum/common/short_id.py:46
@@ -371,84 +451,137 @@ msgstr ""
 msgid "Invalid private key"
 msgstr ""
 
-#: magnum/conductor/template_definition.py:34
-msgid "Location of template to build a k8s cluster on atomic. "
+#: magnum/common/cert_manager/barbican_cert_manager.py:35
+msgid "Retrieved Barbican Container is not of the correct type (certificate)."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:39
-msgid "Location of template to build a k8s cluster on coreos. "
+#: magnum/common/cert_manager/local_cert_manager.py:152
+msgid "Certificate could not be read."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:45
+#: magnum/common/cert_manager/local_cert_manager.py:162
+msgid "Private Key could not be read."
+msgstr ""
+
+#: magnum/common/x509/config.py:38
+msgid "Certificate can get the CA flag in x509 extensions."
+msgstr ""
+
+#: magnum/common/x509/config.py:41
+#, python-format
+msgid "List of allowed x509 extensions. Available values: %s"
+msgstr ""
+
+#: magnum/common/x509/config.py:45
+#, python-format
+msgid "List of allowed x509 key usage. Available values: %s"
+msgstr ""
+
+#: magnum/common/x509/config.py:49
+msgid "Number of days for which a certificate is valid."
+msgstr ""
+
+#: magnum/common/x509/config.py:51
+msgid "Size of generated private key. "
+msgstr ""
+
+#: magnum/conductor/scale_manager.py:44
+#, python-format
+msgid "Output key '%(output_key)s' is missing from stack %(stack_id)s"
+msgstr ""
+
+#: magnum/conductor/template_definition.py:41
+msgid "Location of template to build a k8s cluster on atomic."
+msgstr ""
+
+#: magnum/conductor/template_definition.py:46
+msgid "Location of template to build a k8s cluster on CoreOS."
+msgstr ""
+
+#: 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:49
-msgid "Location of template to build a swarm cluster on atomic. "
+#: magnum/conductor/template_definition.py:59
+msgid "Location of template to build a swarm cluster on atomic."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:53
+#: magnum/conductor/template_definition.py:63
 #, python-format
 msgid ""
 "Format string to use for swarm discovery url. Available values: bay_id, "
-"bay_uuid. Example: \"etcd://etcd.example.com/\\%(bay_uuid)s\" "
+"bay_uuid. Example: \"etcd://etcd.example.com/\\%(bay_uuid)s\""
 msgstr ""
 
-#: magnum/conductor/template_definition.py:58
+#: magnum/conductor/template_definition.py:68
 msgid "Indicates Swarm discovery should use public endpoint."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:62
+#: magnum/conductor/template_definition.py:72
 msgid "Url for swarm public discovery endpoint."
 msgstr ""
 
-#: magnum/conductor/template_definition.py:66
-msgid "Enabled bay definition entry points. "
+#: magnum/conductor/template_definition.py:76
+msgid "Location of template to build a Mesos cluster on Ubuntu."
 msgstr ""
 
-#: magnum/conductor/handlers/bay_conductor.py:152
+#: magnum/conductor/template_definition.py:81
+msgid "Enabled bay definition entry points."
+msgstr ""
+
+#: magnum/conductor/handlers/bay_conductor.py:147
+#, python-format
+msgid "cannot change bay property(ies) %s."
+msgstr ""
+
+#: magnum/conductor/handlers/bay_conductor.py:158
 #, python-format
 msgid "Updating a bay when stack status is \"%s\""
 msgstr ""
 
-#: magnum/conductor/handlers/kube.py:35
-msgid "Default protocol of k8s master endpoint (http or https)."
+#: magnum/db/sqlalchemy/api.py:103
+#, python-format
+msgid "The sort_key value \"%(key)s\" is an invalid field for sorting"
 msgstr ""
 
-#: magnum/conductor/handlers/kube.py:39
-msgid "Default port of the k8s master endpoint."
-msgstr ""
-
-#: magnum/db/sqlalchemy/api.py:230
+#: magnum/db/sqlalchemy/api.py:234
 msgid "Cannot overwrite UUID for an existing Bay."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:387
+#: magnum/db/sqlalchemy/api.py:383
 msgid "Cannot overwrite UUID for an existing BayModel."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:484
+#: magnum/db/sqlalchemy/api.py:477
 msgid "Cannot overwrite UUID for an existing Container."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:580
+#: magnum/db/sqlalchemy/api.py:573
 msgid "Cannot overwrite UUID for an existing Node."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:689
+#: magnum/db/sqlalchemy/api.py:676
 msgid "Cannot overwrite UUID for an existing Pod."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:795
+#: magnum/db/sqlalchemy/api.py:775
 msgid "Cannot overwrite UUID for an existing Service."
 msgstr ""
 
-#: magnum/db/sqlalchemy/api.py:899
+#: magnum/db/sqlalchemy/api.py:872
 msgid "Cannot overwrite UUID for an existing rc."
 msgstr ""
 
+#: magnum/db/sqlalchemy/api.py:946
+msgid "Cannot overwrite UUID for an existing X509KeyPair."
+msgstr ""
+
 #: magnum/db/sqlalchemy/alembic/versions/592131657ca1_add_coe_column_to_baymodel.py:35
-msgid "Container Orchestration Environments are kubernetes or swarm. "
+msgid "Container Orchestration Environments are kubernetes or swarm."
 msgstr ""
 
 #: magnum/objects/utils.py:40
@@ -472,63 +605,17 @@ msgid ""
 " list %(fields)s"
 msgstr ""
 
-#: magnum/openstack/common/log.py:298
-#: magnum/openstack/common/versionutils.py:241
+#: magnum/service/periodic.py:150
 #, python-format
-msgid "Deprecated: %s"
+msgid "Stack with id %s not found in Heat."
 msgstr ""
 
-#: magnum/openstack/common/log.py:406
-#, python-format
-msgid "Error loading logging config %(log_config)s: %(err_msg)s"
-msgstr ""
-
-#: magnum/openstack/common/log.py:467
-#, python-format
-msgid "syslog facility must be one of: %s"
-msgstr ""
-
-#: magnum/openstack/common/log.py:715
-#: magnum/openstack/common/versionutils.py:259
-#, python-format
-msgid "Fatal call to deprecated config: %(msg)s"
-msgstr ""
-
-#: magnum/openstack/common/periodic_task.py:46
-#, python-format
-msgid "Unexpected argument for periodic task creation: %(arg)s."
-msgstr ""
-
-#: magnum/openstack/common/versionutils.py:108
-#, python-format
-msgid ""
-"%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s and "
-"may be removed in %(remove_in)s."
-msgstr ""
-
-#: magnum/openstack/common/versionutils.py:112
-#, python-format
-msgid ""
-"%(what)s is deprecated as of %(as_of)s and may be removed in "
-"%(remove_in)s. It will not be superseded."
-msgstr ""
-
-#: magnum/openstack/common/versionutils.py:116
-#, python-format
-msgid "%(what)s is deprecated as of %(as_of)s in favor of %(in_favor_of)s."
-msgstr ""
-
-#: magnum/openstack/common/versionutils.py:119
-#, python-format
-msgid "%(what)s is deprecated as of %(as_of)s. It will not be superseded."
-msgstr ""
-
-#: magnum/tests/unit/common/test_exception.py:21
+#: magnum/tests/unit/common/test_exception.py:22
 #, python-format
 msgid "templated %(name)s"
 msgstr ""
 
-#: magnum/tests/unit/common/test_exception.py:36
+#: magnum/tests/unit/common/test_exception.py:67
 #, python-format
 msgid "custom templated %(name)s"
 msgstr ""