diff --git a/ceilometer_powervm/locale/ceilometer-powervm.pot b/ceilometer_powervm/locale/ceilometer-powervm.pot
index 1f54391..61efa59 100644
--- a/ceilometer_powervm/locale/ceilometer-powervm.pot
+++ b/ceilometer_powervm/locale/ceilometer-powervm.pot
@@ -1,40 +1,34 @@
 # Translations template for ceilometer-powervm.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 3.0.0.0rc1\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-09-27 12:21-0400\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\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 2.3.4\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr ""
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:100
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:137
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:262
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:317
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:398
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:442
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr ""
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:160
-#, python-format
-msgid "Unable to derive CPU Utilization for VM %s."
-msgstr ""
-
diff --git a/ceilometer_powervm/locale/de/ceilometer-powervm.po b/ceilometer_powervm/locale/de/ceilometer-powervm.po
index 535930e..fa8a723 100644
--- a/ceilometer_powervm/locale/de/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/de/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=n != 1;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "Erwartet wurde genau ein Host; gefunden: %d."
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "VM %s in Beispiel für PowerVM-Metriken nicht gefunden."
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/es/ceilometer-powervm.po b/ceilometer_powervm/locale/es/ceilometer-powervm.po
index 51220ad..1a058c0 100644
--- a/ceilometer_powervm/locale/es/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/es/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=n != 1;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "Se esperaba un único host; se han encontrado %d."
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "No se ha encontrado la máquina virtual %s en el ejemplo de métricas de PowerVM."
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/fr/ceilometer-powervm.po b/ceilometer_powervm/locale/fr/ceilometer-powervm.po
index c7f1caa..931a308 100644
--- a/ceilometer_powervm/locale/fr/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/fr/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=n>1;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "Précisément un hôte attendu ; trouvé %d."
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "Machine virtuelle %s introuvable dans l'échantillon de métriques PowerVM."
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/it/ceilometer-powervm.po b/ceilometer_powervm/locale/it/ceilometer-powervm.po
index a9552eb..3bd7406 100644
--- a/ceilometer_powervm/locale/it/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/it/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=n != 1;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "Previsto un solo host; trovati %d."
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "VM %s non trovata nel campione di metriche PowerVM."
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/ja/ceilometer-powervm.po b/ceilometer_powervm/locale/ja/ceilometer-powervm.po
index 94994df..43532bd 100644
--- a/ceilometer_powervm/locale/ja/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/ja/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "予期されたホストは 1 つのみです。検出されたのは %d 個です。"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "VM %s が PowerVM メトリック・サンプルに見つかりません。"
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/ko/ceilometer-powervm.po b/ceilometer_powervm/locale/ko/ceilometer-powervm.po
index 30d6fa2..36e5175 100644
--- a/ceilometer_powervm/locale/ko/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/ko/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "정확히 하나의 호스트를 예상했지만 %d개를 찾았습니다."
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "PowerVM 메트릭 샘플에서 VM %s을(를) 찾을 수 없습니다."
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/pt-BR/ceilometer-powervm.po b/ceilometer_powervm/locale/pt-BR/ceilometer-powervm.po
index af66a99..faf8fa7 100644
--- a/ceilometer_powervm/locale/pt-BR/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/pt-BR/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=n>1;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
-msgstr "Esperado exatamente um host; localizados %d."
+msgstr "Esperado exatamente um host; localizado %d."
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "A VM %s não localizada na Amostra de métricas do PowerVM."
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/ru/ceilometer-powervm.po b/ceilometer_powervm/locale/ru/ceilometer-powervm.po
index ecfa9d7..6d8d1fe 100644
--- a/ceilometer_powervm/locale/ru/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/ru/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "Ожидался только один хост; обнаружено %d."
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "Виртуальная машина %s не найдена в примере PowerVM Metrics."
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/zh-Hans/ceilometer-powervm.po b/ceilometer_powervm/locale/zh-Hans/ceilometer-powervm.po
index f6eee47..eaf5278 100644
--- a/ceilometer_powervm/locale/zh-Hans/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/zh-Hans/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "期望刚好找到一个主机；但是找到 %d 个主机。"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "在 PowerVM 指标样本中找不到 VM %s。"
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/ceilometer_powervm/locale/zh-Hant/ceilometer-powervm.po b/ceilometer_powervm/locale/zh-Hant/ceilometer-powervm.po
index 163553e..a104fff 100644
--- a/ceilometer_powervm/locale/zh-Hant/ceilometer-powervm.po
+++ b/ceilometer_powervm/locale/zh-Hant/ceilometer-powervm.po
@@ -1,38 +1,39 @@
-# Translations template for ceilometer-powervm.
-# Copyright 2015, 2017 IBM Corp.
+# English translations for ceilometer-powervm.
+# Copyright (C) 2018 ORGANIZATION
 # This file is distributed under the same license as the ceilometer-powervm
 # project.
-# Automatically generated, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer-powervm 5.0.0\n"
+"Project-Id-Version: ceilometer-powervm 6.0.1.dev2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-10-03 04:18-0400\n"
-"PO-Revision-Date: 2017-10-03 04:18-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.5.1\n"
-"Language: en_US\n"
+"POT-Creation-Date: 2018-03-19 18:17-0400\n"
+"PO-Revision-Date: 2018-03-19 18:17-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0;"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.5.3\n"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:82
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:81
 #, python-format
 msgid "Expected exactly one host; found %d."
 msgstr "預期只有一個主機；但找到 %d 個。"
 
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:106
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:245
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:303
-#: ceilometer_powervm/compute/virt/powervm/inspector.py:381
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:105
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:244
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:302
+#: ceilometer_powervm/compute/virt/powervm/inspector.py:380
 #: ceilometer_powervm/compute/virt/powervm/inspector.py:423
 #, python-format
 msgid "VM %s not found in PowerVM Metrics Sample."
 msgstr "在 PowerVM 度量範例中找不到 VM %s。"
 
-# ENGL1SH_VERS10N 12083_2 DO NOT REMOVE OR CHANGE THIS LINE
+
+# ENGL1SH_VERS10N 47169_2 DO NOT REMOVE OR CHANGE THIS LINE
 # T9N_SRC_ID 33
-# T9N_SH1P_STR1NG VC140AAP001 2
+# T9N_SH1P_STR1NG VC141AAP001 1
diff --git a/setup.cfg b/setup.cfg
index 4840b4b..63a9c1a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,6 +36,11 @@ upload-dir = doc/build/html
 directory = ceilometer_powervm/locale
 domain = ceilometer-powervm
 
+[init_catalog]
+domain = ceilometer-powervm
+output_dir = ceilometer_powervm/locale
+input_file = ceilometer_powervm/locale/ceilometer-powervm.pot
+
 [update_catalog]
 domain = ceilometer-powervm
 output_dir = ceilometer_powervm/locale