diff --git a/oslo.vmware/locale/oslo.vmware-log-critical.pot b/oslo.vmware/locale/oslo.vmware-log-critical.pot
new file mode 100644
index 0000000..9b76f2d
--- /dev/null
+++ b/oslo.vmware/locale/oslo.vmware-log-critical.pot
@@ -0,0 +1,20 @@
+# Translations template for oslo.vmware.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the oslo.vmware
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.vmware 0.4.0.3.g1dc80c7\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-07-14 06:00+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"
+
diff --git a/oslo.vmware/locale/oslo.vmware-log-error.pot b/oslo.vmware/locale/oslo.vmware-log-error.pot
new file mode 100644
index 0000000..474bf45
--- /dev/null
+++ b/oslo.vmware/locale/oslo.vmware-log-error.pot
@@ -0,0 +1,97 @@
+# Translations template for oslo.vmware.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the oslo.vmware
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.vmware 0.4.0.3.g1dc80c7\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-07-14 06:00+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"
+
+#: oslo/vmware/api.py:100
+#, python-format
+msgid ""
+"Cannot retry upon suggested exception since retry count (%(retry_count)d)"
+" reached max retry count (%(max_retry_count)d)."
+msgstr ""
+
+#: oslo/vmware/api.py:113
+#, python-format
+msgid ""
+"Exception which is not in the suggested list of exceptions occurred while"
+" invoking %s."
+msgstr ""
+
+#: oslo/vmware/api.py:253
+#, python-format
+msgid ""
+"Error occurred while logging out and terminating the current session with"
+" ID = %s."
+msgstr ""
+
+#: oslo/vmware/api.py:395
+#, python-format
+msgid "Error occurred while reading info of task: %s."
+msgstr ""
+
+#: oslo/vmware/api.py:450
+#, python-format
+msgid "Error occurred while checking state of lease: %s."
+msgstr ""
+
+#: oslo/vmware/exceptions.py:119
+msgid "Exception in string format operation"
+msgstr ""
+
+#: oslo/vmware/exceptions.py:121
+#, python-format
+msgid "%(name)s: %(value)s"
+msgstr ""
+
+#: oslo/vmware/rw_handles.py:414
+#, python-format
+msgid ""
+"Error occurred while updating the write progress of VMDK file with URL = "
+"%s."
+msgstr ""
+
+#: oslo/vmware/rw_handles.py:577
+#, python-format
+msgid ""
+"Error occurred while updating the read progress of VMDK file with URL = "
+"%s."
+msgstr ""
+
+#: oslo/vmware/service.py:131
+#, python-format
+msgid "Faults %s found in RetrievePropertiesEx API response."
+msgstr ""
+
+#: oslo/vmware/common/loopingcall.py:89
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: oslo/vmware/common/loopingcall.py:136
+msgid "in dynamic looping call"
+msgstr ""
+
+#: oslo/vmware/openstack/common/excutils.py:76
+#, python-format
+msgid "Original exception being dropped: %s"
+msgstr ""
+
+#: oslo/vmware/openstack/common/excutils.py:105
+#, python-format
+msgid "Unexpected exception occurred %d time(s)... retrying."
+msgstr ""
+
diff --git a/oslo.vmware/locale/oslo.vmware-log-info.pot b/oslo.vmware/locale/oslo.vmware-log-info.pot
new file mode 100644
index 0000000..1f366f4
--- /dev/null
+++ b/oslo.vmware/locale/oslo.vmware-log-info.pot
@@ -0,0 +1,35 @@
+# Translations template for oslo.vmware.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the oslo.vmware
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.vmware 0.4.0.3.g1dc80c7\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-07-14 06:00+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"
+
+#: oslo/vmware/api.py:216
+#, python-format
+msgid "Successfully established new session; session ID is %s."
+msgstr ""
+
+#: oslo/vmware/api.py:224
+#, python-format
+msgid "Terminating the previous session with ID = %s"
+msgstr ""
+
+#: oslo/vmware/api.py:246
+#, python-format
+msgid "Logging out and terminating the current session with ID = %s."
+msgstr ""
+
diff --git a/oslo.vmware/locale/oslo.vmware-log-warning.pot b/oslo.vmware/locale/oslo.vmware-log-warning.pot
new file mode 100644
index 0000000..551a989
--- /dev/null
+++ b/oslo.vmware/locale/oslo.vmware-log-warning.pot
@@ -0,0 +1,67 @@
+# Translations template for oslo.vmware.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the oslo.vmware
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: oslo.vmware 0.4.0.3.g1dc80c7\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-07-14 06:00+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"
+
+#: oslo/vmware/api.py:93
+#, python-format
+msgid ""
+"Exception which is in the suggested list of exceptions occurred while "
+"invoking function: %s."
+msgstr ""
+
+#: oslo/vmware/api.py:234
+#, python-format
+msgid "Error occurred while terminating the previous session with ID = %s."
+msgstr ""
+
+#: oslo/vmware/api.py:328
+#, python-format
+msgid ""
+"Re-creating session due to connection problems while invoking method "
+"%(module)s.%(method)s."
+msgstr ""
+
+#: oslo/vmware/api.py:353
+#, python-format
+msgid "Error occurred while checking whether the current session: %s is active."
+msgstr ""
+
+#: oslo/vmware/api.py:485
+#, python-format
+msgid "Error occurred while reading error message for lease: %s."
+msgstr ""
+
+#: oslo/vmware/rw_handles.py:65
+msgid "Error occurred while closing the file handle"
+msgstr ""
+
+#: oslo/vmware/rw_handles.py:241
+msgid "Error occurred while reading the HTTP response."
+msgstr ""
+
+#: oslo/vmware/rw_handles.py:447 oslo/vmware/rw_handles.py:609
+#, python-format
+msgid "Error occurred while releasing the lease for %s."
+msgstr ""
+
+#: oslo/vmware/common/loopingcall.py:82
+#, python-format
+msgid "task run outlasted interval by %s sec"
+msgstr ""
+
diff --git a/oslo.vmware/locale/oslo.vmware.pot b/oslo.vmware/locale/oslo.vmware.pot
index 354a0e5..10aaf13 100644
--- a/oslo.vmware/locale/oslo.vmware.pot
+++ b/oslo.vmware/locale/oslo.vmware.pot
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: oslo.vmware 0.3.22.gc4e0294\n"
+"Project-Id-Version: oslo.vmware 0.4.0.3.g1dc80c7\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-06-05 22:50+0200\n"
+"POT-Creation-Date: 2014-07-14 06:00+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"
@@ -18,103 +18,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: oslo/vmware/api.py:91
-#, python-format
-msgid ""
-"Exception which is in the suggested list of exceptions occurred while "
-"invoking function: %s."
-msgstr ""
-
-#: oslo/vmware/api.py:98
-#, python-format
-msgid ""
-"Cannot retry upon suggested exception since retry count (%(retry_count)d)"
-" reached max retry count (%(max_retry_count)d)."
-msgstr ""
-
-#: oslo/vmware/api.py:109
-#, python-format
-msgid ""
-"Exception which is not in the suggested list of exceptions occurred while"
-" invoking %s."
-msgstr ""
-
-#: oslo/vmware/api.py:212
-#, python-format
-msgid "Successfully established new session; session ID is %s."
-msgstr ""
-
-#: oslo/vmware/api.py:219
-#, python-format
-msgid "Terminating the previous session with ID = %s"
-msgstr ""
-
-#: oslo/vmware/api.py:229
-#, python-format
-msgid "Error occurred while terminating the previous session with ID = %s."
-msgstr ""
-
-#: oslo/vmware/api.py:241
-#, python-format
-msgid "Logging out and terminating the current session with ID = %s."
-msgstr ""
-
-#: oslo/vmware/api.py:248
-#, python-format
-msgid ""
-"Error occurred while logging out and terminating the current session with"
-" ID = %s."
-msgstr ""
-
-#: oslo/vmware/api.py:301
+#: oslo/vmware/api.py:306
 #, python-format
 msgid ""
 "Current session: %(session)s is inactive; re-creating the session while "
 "invoking method %(module)s.%(method)s."
 msgstr ""
 
-#: oslo/vmware/api.py:322
-#, python-format
-msgid ""
-"Re-creating session due to connection problems while invoking method "
-"%(module)s.%(method)s."
-msgstr ""
-
-#: oslo/vmware/api.py:347
-#, python-format
-msgid "Error occurred while checking whether the current session: %s is active."
-msgstr ""
-
-#: oslo/vmware/api.py:388
-#, python-format
-msgid "Error occurred while reading info of task: %s."
-msgstr ""
-
-#: oslo/vmware/api.py:402
+#: oslo/vmware/api.py:409
 #, python-format
 msgid "Task: %(task)s failed with error: %(error)s."
 msgstr ""
 
-#: oslo/vmware/api.py:442
-#, python-format
-msgid "Error occurred while checking state of lease: %s."
-msgstr ""
-
-#: oslo/vmware/api.py:456
+#: oslo/vmware/api.py:463
 #, python-format
 msgid "Lease: %(lease)s is in error state. Details: %(error_msg)s."
 msgstr ""
 
-#: oslo/vmware/api.py:463
+#: oslo/vmware/api.py:470
 #, python-format
 msgid "Unknown state: %(state)s for lease: %(lease)s."
 msgstr ""
 
-#: oslo/vmware/api.py:477
-#, python-format
-msgid "Error occurred while reading error message for lease: %s."
-msgstr ""
-
 #: oslo/vmware/exceptions.py:48
 msgid "exception_summary must not be a list"
 msgstr ""
@@ -127,10 +52,6 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: oslo/vmware/exceptions.py:119
-msgid "Exception in string format operation"
-msgstr ""
-
 #: oslo/vmware/exceptions.py:132
 msgid "VMware Driver configuration fault."
 msgstr ""
@@ -194,153 +115,108 @@ msgstr ""
 msgid "Image: %(image)s is in unknown state: %(state)s."
 msgstr ""
 
-#: oslo/vmware/image_transfer.py:192
+#: oslo/vmware/image_transfer.py:193
 #, python-format
 msgid "Error occurred while writing image: %s"
 msgstr ""
 
-#: oslo/vmware/image_transfer.py:277
+#: oslo/vmware/image_transfer.py:278
 msgid "Error occurred during file read-write task."
 msgstr ""
 
-#: oslo/vmware/image_transfer.py:364
+#: oslo/vmware/image_transfer.py:365
 msgid "No image destination given."
 msgstr ""
 
-#: oslo/vmware/image_transfer.py:381
+#: oslo/vmware/image_transfer.py:382
 #, python-format
 msgid ""
 "Error occurred during image transfer with reader: %(reader)s and writer: "
 "%(writer)s"
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:64
-msgid "Error occurred while closing the file handle"
-msgstr ""
-
-#: oslo/vmware/rw_handles.py:142
+#: oslo/vmware/rw_handles.py:143
 msgid "Could not retrieve VMDK URL from lease info."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:192 oslo/vmware/rw_handles.py:335
+#: oslo/vmware/rw_handles.py:193 oslo/vmware/rw_handles.py:336
 #, python-format
 msgid "Invalid scheme: %s."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:206
+#: oslo/vmware/rw_handles.py:207
 #, python-format
 msgid ""
 "Error occurred while creating HTTP connection to write to file with URL ="
 " %s."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:221 oslo/vmware/rw_handles.py:375
+#: oslo/vmware/rw_handles.py:222 oslo/vmware/rw_handles.py:376
 #, python-format
 msgid "Connection error occurred while writing data to %s."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:229 oslo/vmware/rw_handles.py:383
+#: oslo/vmware/rw_handles.py:230 oslo/vmware/rw_handles.py:384
 #, python-format
 msgid "Error occurred while writing data to %s."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:240
-msgid "Error occurred while reading the HTTP response."
-msgstr ""
-
-#: oslo/vmware/rw_handles.py:354
+#: oslo/vmware/rw_handles.py:355
 #, python-format
 msgid ""
 "Error occurred while creating HTTP connection to write to VMDK file with "
 "URL = %s."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:412
-#, python-format
-msgid ""
-"Error occurred while updating the write progress of VMDK file with URL = "
-"%s."
-msgstr ""
-
-#: oslo/vmware/rw_handles.py:445 oslo/vmware/rw_handles.py:607
-#, python-format
-msgid "Error occurred while releasing the lease for %s."
-msgstr ""
-
-#: oslo/vmware/rw_handles.py:519
+#: oslo/vmware/rw_handles.py:521
 #, python-format
 msgid "Error occurred while opening URL: %s for reading."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:545
+#: oslo/vmware/rw_handles.py:547
 #, python-format
 msgid "Error occurred while reading data from %s."
 msgstr ""
 
-#: oslo/vmware/rw_handles.py:574
-#, python-format
-msgid ""
-"Error occurred while updating the read progress of VMDK file with URL = "
-"%s."
-msgstr ""
-
-#: oslo/vmware/vim.py:150
-#, python-format
-msgid "Faults %s found in RetrievePropertiesEx API response."
-msgstr ""
-
-#: oslo/vmware/vim.py:154
+#: oslo/vmware/service.py:135
 msgid "Error occurred while calling RetrievePropertiesEx."
 msgstr ""
 
-#: oslo/vmware/vim.py:216
+#: oslo/vmware/service.py:210
 #, python-format
 msgid "No such SOAP method %s."
 msgstr ""
 
-#: oslo/vmware/vim.py:222
+#: oslo/vmware/service.py:216
 #, python-format
 msgid "httplib error in %s."
 msgstr ""
 
-#: oslo/vmware/vim.py:226
+#: oslo/vmware/service.py:220
 #, python-format
 msgid "urllib2 error in %s."
 msgstr ""
 
-#: oslo/vmware/vim.py:237
+#: oslo/vmware/service.py:231
 #, python-format
 msgid "Socket error in %s."
 msgstr ""
 
-#: oslo/vmware/vim.py:242
+#: oslo/vmware/service.py:236
 #, python-format
 msgid "Type error in %s."
 msgstr ""
 
-#: oslo/vmware/vim.py:245
+#: oslo/vmware/service.py:239
 #, python-format
 msgid "Exception in %s."
 msgstr ""
 
-#: oslo/vmware/common/loopingcall.py:82
-#, python-format
-msgid "task run outlasted interval by %s sec"
-msgstr ""
-
-#: oslo/vmware/common/loopingcall.py:89
-msgid "in fixed duration looping call"
-msgstr ""
-
-#: oslo/vmware/common/loopingcall.py:136
-msgid "in dynamic looping call"
-msgstr ""
-
-#: oslo/vmware/openstack/common/gettextutils.py:297
+#: oslo/vmware/openstack/common/gettextutils.py:320
 msgid "Message objects do not support addition."
 msgstr ""
 
-#: oslo/vmware/openstack/common/gettextutils.py:306
+#: oslo/vmware/openstack/common/gettextutils.py:330
 msgid ""
 "Message objects do not support str() because they may contain non-ascii "
 "characters. Please use unicode() or translate() instead."