diff --git a/po/en_GB.po b/po/en_GB.po
index 427323ea66eecec2f3e3de3a4a6fcd9f564a9787..cb69be1173e0890a134260aee2f4ce7b9b2f0f5b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-14 20:47+0100\n"
-"PO-Revision-Date: 2009-11-20 20:49+1100\n"
+"POT-Creation-Date: 2012-03-06 11:27+0100\n"
+"PO-Revision-Date: 2012-03-04 20:59+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "Language: en\n"
@@ -230,18 +230,16 @@ msgid "Auto-reconnect when connection is lost"
 msgstr "Auto-reconnect when connection is lost"
 
 #: ../data/gui/accounts_window.ui.h:12
-#, fuzzy
 msgid "Browse..."
-msgstr "_Browse"
+msgstr "Browse..."
 
 #: ../data/gui/accounts_window.ui.h:13
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnect on Gajim startup"
 
 #: ../data/gui/accounts_window.ui.h:14
-#, fuzzy
 msgid "Certificate is e_ncrypted"
-msgstr "Certificate rejected"
+msgstr "Certificate is e_ncrypted"
 
 #: ../data/gui/accounts_window.ui.h:15
 msgid "Chan_ge Password"
@@ -268,9 +266,8 @@ msgid "Click to request authorization to all contacts of another account"
 msgstr "Click to request authorisation to all contacts of another account"
 
 #: ../data/gui/accounts_window.ui.h:20
-#, fuzzy
 msgid "Client certificate"
-msgstr "Self signed certificate"
+msgstr "Client certificate"
 
 #: ../data/gui/accounts_window.ui.h:21
 msgid "Co_nnect on Gajim startup"
@@ -449,7 +446,6 @@ msgid "Synchroni_ze account status with global status"
 msgstr "Synchroni_se account status with global status"
 
 #: ../data/gui/accounts_window.ui.h:54
-#, fuzzy
 msgid "Synchronize contacts"
 msgstr "Synchronise contacts"
 
@@ -471,7 +467,7 @@ msgstr "Use file transfer proxies"
 
 #: ../data/gui/accounts_window.ui.h:59
 msgid "_Client Cert File:"
-msgstr ""
+msgstr "_Client Cert File:"
 
 #: ../data/gui/accounts_window.ui.h:60
 msgid "_Edit Personal Information..."
@@ -556,9 +552,8 @@ msgid "_Register"
 msgstr "_Register"
 
 #: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
 msgid "_Save subscription message"
-msgstr "_Subscription"
+msgstr "_Save subscription message"
 
 #: ../data/gui/add_new_contact_window.ui.h:16
 msgid "_User ID:"
@@ -586,9 +581,8 @@ msgid "Error description..."
 msgstr "Error description..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
 msgid "F_inish"
-msgstr "_Finish"
+msgstr "F_inish"
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while retrieving command list..."
@@ -632,9 +626,8 @@ msgid "Deletes Message of the Day"
 msgstr "Deletes Message of the Day"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
-#, fuzzy
 msgid "Edit Archi_ving Preferences"
-msgstr "_Preferences"
+msgstr "Edit Archi_ving Preferences"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
@@ -674,42 +667,39 @@ msgstr "_Send Server Message..."
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
 msgid "<i>Method Auto</i>"
-msgstr ""
+msgstr "<i>Method Auto</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
 msgid "<i>Method Local</i>"
-msgstr ""
+msgstr "<i>Method Local</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
 msgid "<i>Method Manual</i>"
-msgstr ""
+msgstr "<i>Method Manual</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-#, fuzzy
 msgid "Auto"
-msgstr "Auto join"
+msgstr "Auto"
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Concede"
-msgstr ""
+msgstr "Concede"
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
 msgid "Forbid"
-msgstr ""
+msgstr "Forbid"
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
 msgid "No"
-msgstr "None"
+msgstr "No"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-#, fuzzy
 msgid "Prefer"
-msgstr "Preferences"
+msgstr "Prefer"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
@@ -831,7 +821,7 @@ msgstr "#"
 
 #: ../data/gui/chat_control.ui.h:2
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
 msgid "0"
@@ -839,39 +829,39 @@ msgstr "0"
 
 #: ../data/gui/chat_control.ui.h:4
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../data/gui/chat_control.ui.h:5
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #: ../data/gui/chat_control.ui.h:6
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #: ../data/gui/chat_control.ui.h:7
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: ../data/gui/chat_control.ui.h:8
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: ../data/gui/chat_control.ui.h:9
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #: ../data/gui/chat_control.ui.h:10
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #: ../data/gui/chat_control.ui.h:11
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #: ../data/gui/chat_control.ui.h:12
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #: ../data/gui/chat_control.ui.h:13
 msgid "Add this contact to roster (Ctrl+D)"
@@ -894,23 +884,22 @@ msgid "Show a list of formattings"
 msgstr "Show a list of formattings"
 
 #: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
-#, fuzzy
 msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Show a menu of advanced functions (Alt+A)"
+msgstr "Show a menu of advanced functions (Alt+D)"
 
 #: ../data/gui/chat_control.ui.h:19
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "Show the contact's profile (Ctrl+I)"
 
 #: ../data/gui/chat_control.ui.h:20
-#: ../src/command_system/implementation/standard.py:208
+#: ../src/command_system/implementation/standard.py:214
 msgid "Toggle audio session"
-msgstr ""
+msgstr "Toggle audio session"
 
 #: ../data/gui/chat_control.ui.h:21
-#: ../src/command_system/implementation/standard.py:218
+#: ../src/command_system/implementation/standard.py:224
 msgid "Toggle video session"
-msgstr ""
+msgstr "Toggle video session"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
@@ -920,7 +909,7 @@ msgstr "_Send"
 
 #: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
-msgstr ""
+msgstr "label"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
@@ -979,9 +968,8 @@ msgid "Invite _Contacts"
 msgstr "Invite _Contacts"
 
 #: ../data/gui/contact_context_menu.ui.h:8
-#, fuzzy
 msgid "M_anage Contact"
-msgstr "_Manage Contact"
+msgstr "M_anage Contact"
 
 #: ../data/gui/contact_context_menu.ui.h:9
 msgid "Remo_ve"
@@ -1159,9 +1147,8 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Chatstate Tab Colours</b>"
 
 #: ../data/gui/gajim_themes_window.ui.h:2
-#, fuzzy
 msgid "Account row"
-msgstr "Account"
+msgstr "Account row"
 
 #: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1041
 msgid "Bold"
@@ -1169,16 +1156,15 @@ msgstr "Bold"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
-msgstr ""
+msgstr "Chat Banner"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Composing"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
 msgid "Contact row"
-msgstr "Contact"
+msgstr "Contact row"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
@@ -1193,9 +1179,8 @@ msgid "Gone"
 msgstr "Gone"
 
 #: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
 msgid "Group row"
-msgstr "Group"
+msgstr "Group row"
 
 #: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
@@ -1266,9 +1251,8 @@ msgid "_Minimize on close"
 msgstr "_Minimise on close"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:9
-#, fuzzy
 msgid "_Request Voice"
-msgstr "_Voice"
+msgstr "_Request Voice"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Mo_derator"
@@ -1381,23 +1365,20 @@ msgid "_Search Database"
 msgstr "_Search Database"
 
 #: ../data/gui/history_window.ui.h:1
-#, fuzzy
 msgid "All Chat Histories"
-msgstr "Old stories"
+msgstr "All Chat Histories"
 
 #: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Conversation History"
 
 #: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
-msgstr "Contact name"
+msgstr "Enter JID or Contact name"
 
 #: ../data/gui/history_window.ui.h:4
-#, fuzzy
 msgid "Groupchat Histories"
-msgstr "Groupchats"
+msgstr "Groupchat Histories"
 
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
@@ -1410,27 +1391,27 @@ msgstr "_Log conversation history"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
 msgid "approve"
-msgstr ""
+msgstr "approve"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
 msgid "body"
-msgstr ""
+msgstr "body"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
 msgid "concede"
-msgstr ""
+msgstr "concede"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
 msgid "expire"
-msgstr ""
+msgstr "expire"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
 msgid "false"
-msgstr ""
+msgstr "false"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
 msgid "forbid"
-msgstr ""
+msgstr "forbid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
 #: ../src/gajim-remote.py:229
@@ -1446,42 +1427,39 @@ msgstr "message"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
 msgid "oppose"
-msgstr ""
+msgstr "oppose"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
 msgid "otr"
-msgstr "Hot"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
 msgid "prefer"
-msgstr ""
+msgstr "prefer"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
 msgid "require"
-msgstr ""
+msgstr "require"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
 msgid "save"
-msgstr ""
+msgstr "save"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
 msgid "stream"
-msgstr ""
+msgstr "stream"
 
 #: ../data/gui/join_groupchat_window.ui.h:2
-#, fuzzy
 msgid "Bro_wse Rooms"
-msgstr "_Browse"
+msgstr "Bro_wse Rooms"
 
 #: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2336
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
 #: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
 msgid "Join this room _automatically when I connect"
-msgstr "Join this room automatically when I connect"
+msgstr "Join this room _automatically when I connect"
 
 #: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Nickname:"
@@ -1504,9 +1482,8 @@ msgid "Server:"
 msgstr "Server:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-#, fuzzy
 msgid "_Bookmark this room"
-msgstr "Bookmark this room"
+msgstr "_Bookmark this room"
 
 #: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
 #: ../src/disco.py:1804
@@ -1514,9 +1491,8 @@ msgid "_Join"
 msgstr "_Join"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-#, fuzzy
 msgid "A_uto join"
-msgstr "Auto join"
+msgstr "A_uto join"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
@@ -1527,23 +1503,20 @@ msgid "Manage Bookmarks"
 msgstr "Manage Bookmarks"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-#, fuzzy
 msgid "Minimi_ze on Auto Join"
-msgstr "Minimise on Auto Join"
+msgstr "Minimi_se on Auto Join"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:5
-#, fuzzy
 msgid "Pr_int status:"
-msgstr "Print status:"
+msgstr "Pr_int status:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Roo_m:"
-msgstr ""
+msgstr "Roo_m:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-#, fuzzy
 msgid "_Title:"
-msgstr "Title:"
+msgstr "_Title:"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1563,15 +1536,11 @@ msgstr "<b>Settings</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
-msgstr ""
+msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
 msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgstr "HTTP Connect"
 
 #: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
@@ -1591,7 +1560,7 @@ msgstr "Proxy _Port:"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
@@ -1623,73 +1592,67 @@ msgstr "Passphrase"
 
 #: ../data/gui/plugins_window.ui.h:1
 msgid "&lt;empty&gt;"
-msgstr ""
+msgstr "&lt;empty&gt;"
 
 #: ../data/gui/plugins_window.ui.h:2
 msgid "<empty>"
-msgstr ""
+msgstr "<empty>"
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
 msgid "Authors:"
-msgstr "Au_thorise"
+msgstr "Authors:"
 
 #: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
 msgid "Configure"
-msgstr "_Configure"
+msgstr "Configure"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
 msgid "Description:"
-msgstr "Description: "
+msgstr "Description:"
 
 #: ../data/gui/plugins_window.ui.h:6
-#, fuzzy
 msgid "Homepage:"
-msgstr "<b>Homepage:</b>"
+msgstr "Homepage:"
 
 #: ../data/gui/plugins_window.ui.h:7
 msgid "Install from zip"
-msgstr ""
+msgstr "Install from zip"
 
 #: ../data/gui/plugins_window.ui.h:8
-#, fuzzy
 msgid "Installed"
-msgstr "Stalled"
+msgstr "Installed"
 
 #: ../data/gui/plugins_window.ui.h:9
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
 msgstr ""
+"Plug-in decription should be displayed here. This text will be erased during "
+"PluginsWindow initialisation."
 
 #: ../data/gui/plugins_window.ui.h:10
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: ../data/gui/plugins_window.ui.h:11
 msgid "Uninstall"
-msgstr ""
+msgstr "Uninstall"
 
 #: ../data/gui/plugins_window.ui.h:12
-#, fuzzy
 msgid "Version:"
-msgstr "GTK+ Version:"
+msgstr "Version:"
 
 #: ../data/gui/plugins_window.ui.h:13
 msgid "homepage url"
-msgstr ""
+msgstr "homepage url"
 
 #: ../data/gui/popup_notification_window.ui.h:1
-#, fuzzy
 msgid "Event Type"
-msgstr "Event"
+msgstr "Event Type"
 
 #: ../data/gui/popup_notification_window.ui.h:2
-#, fuzzy
 msgid "Event desc"
-msgstr "Events"
+msgstr "Event desc"
 
 #: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
@@ -1700,9 +1663,8 @@ msgid "<b>Applications</b>"
 msgstr "<b>Applications</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "<b>Actions</b>"
+msgstr "<b>Audio</b>"
 
 #: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
@@ -1721,9 +1683,8 @@ msgid "<b>Chat state notifications</b>"
 msgstr "<b>Chat state notifications</b>"
 
 #: ../data/gui/preferences_window.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Conditions</b>"
+msgstr "<b>Connection</b>"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
@@ -1763,9 +1724,8 @@ msgid "<b>Themes</b>"
 msgstr "<b>Themes</b>"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "<b>Middle:</b>"
+msgstr "<b>Video</b>"
 
 #: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
@@ -1773,31 +1733,27 @@ msgstr "<b>Visual Notifications</b>"
 
 #: ../data/gui/preferences_window.ui.h:22
 msgid "<i>(example: stunserver.org)</i>"
-msgstr ""
+msgstr "<i>(example: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Advanced"
 
 #: ../data/gui/preferences_window.ui.h:24
-#, fuzzy
 msgid "All chat states"
-msgstr "All statuses"
+msgstr "All chat states"
 
 #: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
 msgid "Allow client / _OS information to be sent"
-msgstr "Allow _OS information to be sent"
+msgstr "Allow client / _OS information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:26
-#, fuzzy
 msgid "Allow local system time information to be sent"
-msgstr "Allow _OS information to be sent"
+msgstr "Allow local system time information to be sent"
 
 #: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
 msgid "Allow my _idle time to be sent"
-msgstr "Allow _OS information to be sent"
+msgstr "Allow my _idle time to be sent"
 
 #: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
@@ -1808,9 +1764,8 @@ msgid "Allow sound when I'm _busy"
 msgstr "Allow sound when I'm _busy"
 
 #: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
 msgid "Always"
-msgstr "Away"
+msgstr "Always"
 
 #: ../data/gui/preferences_window.ui.h:31
 msgid "Ask status message when I:"
@@ -1818,15 +1773,15 @@ msgstr "Ask status message when I:"
 
 #: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:106
 msgid "Audio / Video"
-msgstr ""
+msgstr "Audio / Video"
 
 #: ../data/gui/preferences_window.ui.h:33
 msgid "Audio input device"
-msgstr ""
+msgstr "Audio input device"
 
 #: ../data/gui/preferences_window.ui.h:34
 msgid "Audio output device"
-msgstr ""
+msgstr "Audio output device"
 
 #: ../data/gui/preferences_window.ui.h:35
 msgid "Chat message:"
@@ -1837,23 +1792,20 @@ msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Check on startup if Gajim is the _default Jabber client"
 
 #: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
 msgid "Composing only"
-msgstr "Composing"
+msgstr "Composing only"
 
 #: ../data/gui/preferences_window.ui.h:38
 msgid "Configure color and font of the interface"
 msgstr "Configure colour and font of the interface"
 
 #: ../data/gui/preferences_window.ui.h:39
-#, fuzzy
 msgid "Contact's message:"
-msgstr "Chat message:"
+msgstr "Contact's message:"
 
 #: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
 msgid "Contact's nickname:"
-msgstr "Contact name"
+msgstr "Contact's nickname:"
 
 #: ../data/gui/preferences_window.ui.h:41
 msgid "Custom"
@@ -1861,19 +1813,19 @@ msgstr "Custom"
 
 #: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgstr "Detached roster with chat grouped by account"
 
 #: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgstr "Detached roster with chat grouped by type"
 
 #: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with detached chats"
-msgstr ""
+msgstr "Detached roster with detached chats"
 
 #: ../data/gui/preferences_window.ui.h:45
 msgid "Detached roster with single chat"
-msgstr ""
+msgstr "Detached roster with single chat"
 
 #: ../data/gui/preferences_window.ui.h:46 ../src/config.py:171
 #: ../src/config.py:683
@@ -1889,9 +1841,8 @@ msgid "Display _extra email details"
 msgstr "Display _extra e-mail details"
 
 #: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
 msgid "Display _location of contacts in roster"
-msgstr "Display m_ood of contacts in roster"
+msgstr "Display _location of contacts in roster"
 
 #: ../data/gui/preferences_window.ui.h:50
 msgid "Display _tunes of contacts in roster"
@@ -1939,7 +1890,7 @@ msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:58
 msgid "Global proxy:"
-msgstr ""
+msgstr "Global proxy:"
 
 #: ../data/gui/preferences_window.ui.h:59
 msgid "Hide all buttons in chat windows"
@@ -1954,11 +1905,8 @@ msgstr ""
 "using"
 
 #: ../data/gui/preferences_window.ui.h:61
-#, fuzzy
 msgid "If checked, Gajim will allow others to detect the time on your system"
-msgstr ""
-"If ticked, Gajim will allow others to detect the operation system you are "
-"using"
+msgstr "If ticked, Gajim will allow others to detect the time on your system"
 
 #: ../data/gui/preferences_window.ui.h:62
 msgid ""
@@ -2005,11 +1953,10 @@ msgstr ""
 "If ticked, Gajim will display the activity of contacts in the roster window"
 
 #: ../data/gui/preferences_window.ui.h:68
-#, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr ""
-"If ticked, Gajim will display the mood of contacts in the roster window"
+"If ticked, Gajim will display the location of contacts in the roster window"
 
 #: ../data/gui/preferences_window.ui.h:69
 msgid ""
@@ -2088,9 +2035,8 @@ msgstr ""
 "animated or static graphical emoticons"
 
 #: ../data/gui/preferences_window.ui.h:78
-#, fuzzy
 msgid "Last state"
-msgstr "Last status: %s"
+msgstr "Last state"
 
 #: ../data/gui/preferences_window.ui.h:79
 msgid "Log _encrypted chat session"
@@ -2105,9 +2051,8 @@ msgid "Ma_nage..."
 msgstr "Ma_nage..."
 
 #: ../data/gui/preferences_window.ui.h:82
-#, fuzzy
 msgid "Never"
-msgstr "_Never"
+msgstr "Never"
 
 #: ../data/gui/preferences_window.ui.h:83
 msgid "Notifications"
@@ -2122,21 +2067,16 @@ msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
 #: ../data/gui/preferences_window.ui.h:86
-#, fuzzy
 msgid "Notify me about it"
-msgstr "_Notify me about it"
+msgstr "Notify me about it"
 
 #: ../data/gui/preferences_window.ui.h:87
 msgid "Notify on new _GMail email"
 msgstr "Notify on new _GMail email"
 
 #: ../data/gui/preferences_window.ui.h:88
-#, fuzzy
 msgid "Only when pending events"
-msgstr ""
-"Never\n"
-"Only when pending events\n"
-"Always"
+msgstr "Only when pending events"
 
 #: ../data/gui/preferences_window.ui.h:89
 msgid "Personal Events"
@@ -2147,9 +2087,8 @@ msgid "Play _sounds"
 msgstr "Play _sounds"
 
 #: ../data/gui/preferences_window.ui.h:91
-#, fuzzy
 msgid "Pop it up"
-msgstr "_Pop it up"
+msgstr "Pop it up"
 
 #: ../data/gui/preferences_window.ui.h:92
 msgid "Preferences"
@@ -2160,21 +2099,20 @@ msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
 
 #: ../data/gui/preferences_window.ui.h:95
-#, fuzzy
 msgid "STUN server:"
-msgstr "Server:"
+msgstr "STUN server:"
 
 #: ../data/gui/preferences_window.ui.h:96
-#, fuzzy
 msgid "Show notification area icon:"
-msgstr "Use t_rayicon (aka. notification area icon)"
+msgstr "Show notification area icon:"
 
 #: ../data/gui/preferences_window.ui.h:97
-#, fuzzy
 msgid "Show only in roster"
-msgstr "Show only in _roster"
+msgstr "Show only in roster"
 
 #: ../data/gui/preferences_window.ui.h:98
 msgid "Sign _in"
@@ -2186,7 +2124,7 @@ msgstr "Sign _out"
 
 #: ../data/gui/preferences_window.ui.h:100
 msgid "Single window for everything"
-msgstr ""
+msgstr "Single window for everything"
 
 #: ../data/gui/preferences_window.ui.h:101
 msgid ""
@@ -2245,9 +2183,8 @@ msgid "Use _transports icons"
 msgstr "Use _transports icons"
 
 #: ../data/gui/preferences_window.ui.h:114
-#, fuzzy
 msgid "Use default applications"
-msgstr "Always use OS/X default applications"
+msgstr "Use default applications"
 
 #: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
@@ -2255,33 +2192,31 @@ msgstr "Use system _default"
 
 #: ../data/gui/preferences_window.ui.h:116
 msgid "Video framerate"
-msgstr ""
+msgstr "Video framerate"
 
 #: ../data/gui/preferences_window.ui.h:117
 msgid "Video input device"
-msgstr ""
+msgstr "Video input device"
 
 #: ../data/gui/preferences_window.ui.h:118
 msgid "Video output device"
-msgstr ""
+msgstr "Video output device"
 
 #: ../data/gui/preferences_window.ui.h:119
 msgid "Video size"
-msgstr ""
+msgstr "Video size"
 
 #: ../data/gui/preferences_window.ui.h:120
 msgid "When new event is received:"
 msgstr "When new event is received:"
 
 #: ../data/gui/preferences_window.ui.h:121
-#, fuzzy
 msgid "Your message:"
-msgstr "Error message: %s"
+msgstr "Your message:"
 
 #: ../data/gui/preferences_window.ui.h:122
-#, fuzzy
 msgid "Your nickname:"
-msgstr "B_efore nickname:"
+msgstr "Your nickname:"
 
 #: ../data/gui/preferences_window.ui.h:123
 msgid "_Away after:"
@@ -2340,9 +2275,8 @@ msgid "_Send chat state notifications:"
 msgstr "_Send chat state notifications:"
 
 #: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
 msgid "_Show roster on startup:"
-msgstr "Show _roster"
+msgstr "_Show roster on startup:"
 
 #: ../data/gui/preferences_window.ui.h:139
 msgid "_Status message:"
@@ -2429,24 +2363,20 @@ msgid "all in the group"
 msgstr "all in the group"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
 msgid "both"
-msgstr "Both"
+msgstr "both"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
 msgid "from"
-msgstr "From"
+msgstr "from"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
 msgid "none"
-msgstr "one"
+msgstr "none"
 
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
 msgid "to"
-msgstr "two"
+msgstr "to"
 
 #: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
@@ -2675,7 +2605,7 @@ msgstr "Help online"
 
 #: ../data/gui/roster_window.ui.h:8
 msgid "P_lugins"
-msgstr ""
+msgstr "P_lugins"
 
 #: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
@@ -2686,9 +2616,8 @@ msgid "Show Only _Active Contacts"
 msgstr "Show Only _Active Contacts"
 
 #: ../data/gui/roster_window.ui.h:12
-#, fuzzy
 msgid "Show T_ransports"
-msgstr "Show Trans_ports"
+msgstr "Show T_ransports"
 
 #: ../data/gui/roster_window.ui.h:13
 msgid "Show _Offline Contacts"
@@ -2863,9 +2792,8 @@ msgid "<b>Client:</b>"
 msgstr "<b>Client:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
 msgid "<b>Configured avatar:</b>"
-msgstr "Configured avatar:"
+msgstr "<b>Configured avatar:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Contact time:</b>"
@@ -2893,9 +2821,8 @@ msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:40
-#, fuzzy
 msgid "<b>User avatar:</b>"
-msgstr "<b>Avatar:</b>"
+msgstr "<b>User avatar:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:43
 msgid "Comments"
@@ -2915,9 +2842,8 @@ msgid "More"
 msgstr "More"
 
 #: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
 msgid "<b>Filter</b>"
-msgstr "<b>Font</b>"
+msgstr "<b>Filter</b>"
 
 #: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
@@ -2929,23 +2855,23 @@ msgstr "<b>XML Input</b>"
 
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
-msgstr ""
+msgstr "Hide IN stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:5
 msgid "Hide IQ stanzas"
-msgstr ""
+msgstr "Hide IQ stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:6
 msgid "Hide Message stanzas"
-msgstr ""
+msgstr "Hide Message stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:7
 msgid "Hide OUT stanzas"
-msgstr ""
+msgstr "Hide OUT stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:8
 msgid "Hide Presence stanzas"
-msgstr ""
+msgstr "Hide Presence stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
@@ -3007,14 +2933,12 @@ msgstr ""
 "You are in process of executing command. Do you really want to cancel it?"
 
 #: ../src/adhoc_commands.py:370
-#, fuzzy
 msgid "Invalid Form"
-msgstr "Invalid room"
+msgstr "Invalid Form"
 
 #: ../src/adhoc_commands.py:371
-#, fuzzy
 msgid "The form is not filled correctly."
-msgstr "The nickname has not allowed characters."
+msgstr "The form is not filled correctly."
 
 #: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
@@ -3025,9 +2949,9 @@ msgid "Service changed the session identifier."
 msgstr "Service changed the session identifier."
 
 #: ../src/adhoc_commands.py:418
-#, fuzzy, python-format
+#, python-format
 msgid "%s - Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc Commands - Gajim"
+msgstr "%s - Ad-hoc Commands - Gajim"
 
 #. when stanza doesn't have error description
 #: ../src/adhoc_commands.py:513
@@ -3081,11 +3005,11 @@ msgid "Hidden"
 msgstr "Hidden"
 
 #: ../src/atom_window.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "You have received new entries (and %d not displayed):"
 msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] "You have received new entries (and %(count)d not displayed):"
-msgstr[1] "You have received new entries (and %(count)d not displayed):"
+msgstr[0] "You have received new entries (and %d not displayed):"
+msgstr[1] "You have received new entries (and %d not displayed):"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
@@ -3248,9 +3172,8 @@ msgid "GPG encryption enabled"
 msgstr "GPG encryption enabled"
 
 #: ../src/chat_control.py:1658 ../src/chat_control.py:1661
-#, fuzzy
 msgid "Requires python-farsight."
-msgstr "Requires python-avahi."
+msgstr "Requires python-farsight."
 
 #. Add to roster
 #: ../src/chat_control.py:1701 ../src/common/contacts.py:158
@@ -3276,7 +3199,7 @@ msgstr ""
 #: ../src/chat_control.py:1850
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
-msgstr ""
+msgstr "%(type)s state : %(state)s, reason: %(reason)s"
 
 #: ../src/chat_control.py:2041
 #, python-format
@@ -3354,12 +3277,11 @@ msgstr "Session negotiation cancelled"
 
 #: ../src/chat_control.py:2388
 msgid "This session WILL be archived on server"
-msgstr ""
+msgstr "This session WILL be archived on server"
 
 #: ../src/chat_control.py:2390
-#, fuzzy
 msgid "This session WILL NOT be archived on server"
-msgstr "Session WILL NOT be logged"
+msgstr "This session WILL NOT be archived on server"
 
 #: ../src/chat_control.py:2399
 msgid "This session is encrypted"
@@ -3408,8 +3330,8 @@ msgstr ""
 "lost."
 
 #: ../src/chat_control.py:2924 ../src/common/connection_handlers_events.py:898
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1055 ../src/common/connection.py:467
+#: ../src/common/connection_handlers.py:949
+#: ../src/common/connection_handlers.py:1061 ../src/common/connection.py:467
 #: ../src/common/logger.py:1131 ../src/gajim.py:210 ../src/session.py:100
 msgid "Database Error"
 msgstr "Database Error"
@@ -3438,19 +3360,16 @@ msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
 
 #: ../src/chat_control.py:3253
-#, fuzzy
 msgid "File transfer"
-msgstr "File Transfers"
+msgstr "File transfer"
 
 #: ../src/chat_control.py:3256
-#, fuzzy
 msgid "Size"
-msgstr "Size: %s"
+msgstr "Size"
 
 #: ../src/chat_control.py:3258
-#, fuzzy
 msgid "_Accept"
-msgstr "Accept"
+msgstr "_Accept"
 
 #: ../src/chat_control.py:3281 ../src/filetransfers_window.py:204
 msgid "File transfer completed"
@@ -3482,49 +3401,48 @@ msgstr "Connection with peer cannot be established."
 
 #: ../src/command_system/implementation/custom.py:105
 msgid "The same as using a doc-string, except it supports translation"
-msgstr ""
+msgstr "The same as using a doc-string, except it supports translation"
 
 #: ../src/command_system/implementation/execute.py:53
 msgid "Execute expression inside a shell, show output"
-msgstr ""
+msgstr "Execute expression inside a shell, show output"
 
 #: ../src/command_system/implementation/execute.py:109
 msgid "Execute expression inside a shell, send output"
-msgstr ""
+msgstr "Execute expression inside a shell, send output"
 
 #: ../src/command_system/implementation/standard.py:50
-#, fuzzy
 msgid "Hide the chat buttons"
-msgstr "Usage: /%s, hide the chat buttons."
+msgstr "Hide the chat buttons"
 
 #: ../src/command_system/implementation/standard.py:56
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
+"Show help on a given command or a list of available commands if -a is given"
 
 #: ../src/command_system/implementation/standard.py:83
-#, fuzzy
 msgid "Send a message to the contact"
-msgstr "Usage: /%s, send the message to the contact"
+msgstr "Send a message to the contact"
 
 #: ../src/command_system/implementation/standard.py:88
 msgid "Send action (in the third person) to the current chat"
-msgstr ""
+msgstr "Send action (in the third person) to the current chat"
 
 #: ../src/command_system/implementation/standard.py:93
 msgid "Show logged messages which mention given text"
-msgstr ""
+msgstr "Show logged messages which mention given text"
 
 #: ../src/command_system/implementation/standard.py:99
-#, fuzzy, python-format
+#, python-format
 msgid "%s: Nothing found"
-msgstr "%s not found"
+msgstr "%s: Nothing found"
 
 #: ../src/command_system/implementation/standard.py:105
 msgid "Limit must be an integer"
-msgstr ""
+msgstr "Limit must be an integer"
 
-#: ../src/command_system/implementation/standard.py:140
+#: ../src/command_system/implementation/standard.py:129
 msgid ""
 "\n"
 "    Set current the status\n"
@@ -3533,12 +3451,18 @@ msgid ""
 "    chat, xa, dnd.\n"
 "    "
 msgstr ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values: online, away,\n"
+"    chat, xa, dnd.\n"
+"    "
 
-#: ../src/command_system/implementation/standard.py:153
+#: ../src/command_system/implementation/standard.py:147
 msgid "Set the current status to away"
-msgstr ""
+msgstr "Set the current status to away"
 
-#: ../src/command_system/implementation/standard.py:156
+#: ../src/command_system/implementation/standard.py:150
 #: ../src/common/commands.py:109 ../src/common/helpers.py:249
 #: ../src/tooltips.py:194
 msgid "Away"
@@ -3546,114 +3470,100 @@ msgstr "Away"
 
 #: ../src/command_system/implementation/standard.py:161
 msgid "Set the current status to online"
-msgstr ""
+msgstr "Set the current status to online"
 
 #: ../src/command_system/implementation/standard.py:164
-#, fuzzy
 msgid "Available"
-msgstr "_Available"
+msgstr "Available"
 
-#: ../src/command_system/implementation/standard.py:178
-#: ../src/command_system/implementation/standard.py:255
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:184
+#: ../src/command_system/implementation/standard.py:261
 msgid "Clear the text window"
-msgstr "Usage: /%s, clears the text window."
+msgstr "Clear the text window"
 
-#: ../src/command_system/implementation/standard.py:183
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:189
 msgid "Toggle the GPG encryption"
-msgstr "Toggle Open_PGP Encryption"
+msgstr "Toggle the GPG encryption"
 
-#: ../src/command_system/implementation/standard.py:188
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:194
 msgid "Send a ping to the contact"
-msgstr "Usage: /%s, sends a ping to the contact"
+msgstr "Send a ping to the contact"
 
-#: ../src/command_system/implementation/standard.py:191
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:197
 msgid "Command is not supported for zeroconf accounts"
-msgstr "Command not supported for zeroconf account."
+msgstr "Command is not supported for zeroconf accounts"
 
-#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:201
 msgid "Send DTMF sequence through an open audio session"
-msgstr ""
+msgstr "Send DTMF sequence through an open audio session"
 
-#: ../src/command_system/implementation/standard.py:198
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:204
 msgid "No open audio sessions with the contact"
-msgstr "Click to see past conversations with this contact"
+msgstr "No open audio sessions with the contact"
 
-#: ../src/command_system/implementation/standard.py:201
-#, fuzzy, python-format
+#: ../src/command_system/implementation/standard.py:207
+#, python-format
 msgid "%s is not a valid tone"
-msgstr "%s is not a valid loglevel"
+msgstr "%s is not a valid tone"
 
-#: ../src/command_system/implementation/standard.py:211
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:217
 msgid "Audio sessions are not available"
-msgstr "A connection is not available"
+msgstr "Audio sessions are not available"
 
-#: ../src/command_system/implementation/standard.py:221
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:227
 msgid "Video sessions are not available"
-msgstr "Connection not available"
+msgstr "Video sessions are not available"
 
-#: ../src/command_system/implementation/standard.py:262
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:268
 msgid "Change your nickname in a group chat"
-msgstr "Change your nickname (Ctrl+N)"
+msgstr "Change your nickname in a group chat"
 
 #. invalid char
-#: ../src/command_system/implementation/standard.py:267 ../src/config.py:3392
+#: ../src/command_system/implementation/standard.py:273 ../src/config.py:3392
 #: ../src/dialogs.py:2078
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../src/command_system/implementation/standard.py:272
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:278
 msgid "Open a private chat window with a specified occupant"
-msgstr ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
+msgstr "Open a private chat window with a specified occupant"
 
-#: ../src/command_system/implementation/standard.py:278
-#: ../src/command_system/implementation/standard.py:287
-#: ../src/command_system/implementation/standard.py:341
+#: ../src/command_system/implementation/standard.py:284
+#: ../src/command_system/implementation/standard.py:293
+#: ../src/command_system/implementation/standard.py:347
 msgid "Nickname not found"
 msgstr "Nickname not found"
 
-#: ../src/command_system/implementation/standard.py:281
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:287
 msgid ""
 "Open a private chat window with a specified occupant and send him a message"
 msgstr ""
-"Usage: /%s <nickname>, opens a private chat window with the specified "
-"occupant."
+"Open a private chat window with a specified occupant and send him a message"
 
-#: ../src/command_system/implementation/standard.py:290
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:296
 msgid "Display or change a group chat topic"
-msgstr "Ask before closing a group chat tab/window."
+msgstr "Display or change a group chat topic"
 
-#: ../src/command_system/implementation/standard.py:298
+#: ../src/command_system/implementation/standard.py:304
 msgid "Invite a user to a room for a reason"
-msgstr ""
+msgstr "Invite a user to a room for a reason"
 
-#: ../src/command_system/implementation/standard.py:301
-#, fuzzy, python-format
+#: ../src/command_system/implementation/standard.py:307
+#, python-format
 msgid "Invited %s to %s"
-msgstr "Send %s to %s"
+msgstr "Invited %s to %s"
 
-#: ../src/command_system/implementation/standard.py:304
+#: ../src/command_system/implementation/standard.py:310
 msgid "Join a group chat given by a jid, optionally using given nickname"
-msgstr ""
+msgstr "Join a group chat given by a jid, optionally using given nickname"
 
-#: ../src/command_system/implementation/standard.py:321
+#: ../src/command_system/implementation/standard.py:327
 msgid ""
 "Leave the groupchat, optionally giving a reason, and close tab or window"
 msgstr ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
 
-#: ../src/command_system/implementation/standard.py:326
+#: ../src/command_system/implementation/standard.py:332
 msgid ""
 "\n"
 "    Ban user by a nick or a jid from a groupchat\n"
@@ -3661,33 +3571,35 @@ msgid ""
 "    If given nickname is not found it will be treated as a jid.\n"
 "    "
 msgstr ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
 
-#: ../src/command_system/implementation/standard.py:338
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:344
 msgid "Kick user by a nick from a groupchat"
-msgstr "You are invited to a groupchat"
+msgstr "Kick user by a nick from a groupchat"
 
-#: ../src/command_system/implementation/standard.py:345
-#, fuzzy
+#: ../src/command_system/implementation/standard.py:351
 msgid "Display names of all group chat occupants"
-msgstr "Usage: /%s , display the names of group chat occupants."
+msgstr "Display names of all group chat occupants"
 
-#: ../src/command_system/implementation/standard.py:367
+#: ../src/command_system/implementation/standard.py:373
 msgid "Forbid an occupant to send you public or private messages"
-msgstr ""
+msgstr "Forbid an occupant to send you public or private messages"
 
-#: ../src/command_system/implementation/standard.py:372
+#: ../src/command_system/implementation/standard.py:378
 msgid "Allow an occupant to send you public or private messages"
-msgstr ""
+msgstr "Allow an occupant to send you public or private messages"
 
 #: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "creating logs database"
 
 #: ../src/common/check_paths.py:86
-#, fuzzy
 msgid "creating cache database"
-msgstr "creating logs database"
+msgstr "creating cache database"
 
 #: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
 #: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
@@ -3793,9 +3705,8 @@ msgid "All unread messages have been forwarded."
 msgstr "All unread messages have been forwarded."
 
 #: ../src/common/commands.py:298
-#, fuzzy
 msgid "Forward unread message then disconnect"
-msgstr "Forward unread messages"
+msgstr "Forward unread message then disconnect"
 
 #: ../src/common/config.py:76
 msgid "Play sound when user is busy"
@@ -3834,14 +3745,14 @@ msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S will be replaced by current status message, $T by autoxa time."
 
 #: ../src/common/config.py:89
-#, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
-msgstr "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+"When to show notification area icon. Can be 'never', 'on_event', 'always'."
 
 #: ../src/common/config.py:90
 msgid "Allow to hide the roster window even if the tray icon is not shown."
-msgstr ""
+msgstr "Allow to hide the roster window even if the tray icon is not shown."
 
 #: ../src/common/config.py:95
 msgid "Incoming nickname color."
@@ -3961,6 +3872,8 @@ msgid ""
 "If true, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
+"If true, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
 
 #: ../src/common/config.py:162
 msgid ""
@@ -3984,6 +3897,7 @@ msgstr "Characters that are printed after the nickname in conversations"
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr ""
+"Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 
 #: ../src/common/config.py:169
 msgid "Add * and [n] in roster title?"
@@ -4002,18 +3916,20 @@ msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
 #: ../src/common/config.py:172
-#, fuzzy
 msgid ""
 "How many lines to request to server when entering a groupchat. -1 means no "
 "limit"
-msgstr "How many lines to request to server when entering a groupchat."
+msgstr ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 
 #: ../src/common/config.py:173
-#, fuzzy
 msgid ""
 "How many minutes back to request logs when a entering a groupchat. -1 means "
 "no limit"
-msgstr "How many minutes back to request logs when a entering a groupchat."
+msgstr ""
+"How many minutes back to request logs when a entering a groupchat. -1 means "
+"no limit"
 
 #: ../src/common/config.py:174
 msgid ""
@@ -4027,6 +3943,7 @@ msgstr ""
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
+"Should autorejoin be activated when we are being kicked from a conference?"
 
 #: ../src/common/config.py:176
 msgid ""
@@ -4128,9 +4045,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
 #: ../src/common/config.py:200
-#, fuzzy
 msgid "Notify of events in the notification area."
-msgstr "Notify of events in the system trayicon."
+msgstr "Notify of events in the notification area."
 
 #: ../src/common/config.py:206
 msgid "Show tab when only one conversation?"
@@ -4167,13 +4083,12 @@ msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
 #: ../src/common/config.py:224
-#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if notification icon is used."
 msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
-"setting is taken into account only if trayicon is used."
+"setting is taken into account only if notification icon is used."
 
 #: ../src/common/config.py:225
 msgid ""
@@ -4233,7 +4148,7 @@ msgstr ""
 
 #: ../src/common/config.py:238
 msgid "Log XHTML messages instead of plain text messages."
-msgstr ""
+msgstr "Log XHTML messages instead of plain text messages."
 
 #: ../src/common/config.py:239
 msgid "Background color of contacts when they just signed in."
@@ -4305,6 +4220,10 @@ msgid ""
 "'never' - Never show roster.\n"
 "'last_state' - Restore the last state roster."
 msgstr ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
 
 #: ../src/common/config.py:252
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -4453,13 +4372,12 @@ msgstr ""
 "cleared."
 
 #: ../src/common/config.py:275
-#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
-"systray icon."
+"notification icon."
 
 #: ../src/common/config.py:276
 msgid "Choose interval between 2 checks of idleness."
@@ -4503,33 +4421,39 @@ msgstr ""
 
 #: ../src/common/config.py:286
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
-msgstr ""
+msgstr "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 
 #: ../src/common/config.py:287
 msgid "Optionally resize jingle output video. Example: 320x240"
-msgstr ""
+msgstr "Optionally resize jingle output video. Example: 320x240"
 
 #: ../src/common/config.py:290
 msgid ""
 "If True, Gajim will try to use a STUN server when using jingle. The one in "
 "\"stun_server\" option, or the one given by the jabber server."
 msgstr ""
+"If True, Gajim will try to use a STUN server when using jingle. The one in "
+"\"stun_server\" option, or the one given by the jabber server."
 
 #: ../src/common/config.py:291
 msgid "STUN server to use when using jingle"
-msgstr ""
+msgstr "STUN server to use when using jingle"
 
 #: ../src/common/config.py:292
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"coloured square to the status icon"
 
 #: ../src/common/config.py:293
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
 msgstr ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
 
 #: ../src/common/config.py:307
 msgid ""
@@ -4586,23 +4510,23 @@ msgstr ""
 "ssl or plain"
 
 #: ../src/common/config.py:327
-#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
-"Show a warning dialogue before sending password on an plaintext connection."
+"Show a warning dialogue before sending password on a plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 
 #: ../src/common/config.py:328
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
 #: ../src/common/config.py:329
-#, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
-"Show a warning dialogue before sending password on an plaintext connection."
+"Show a warning dialogue before sending PLAIN password over a plain "
+"connection."
 
 #: ../src/common/config.py:331
 msgid "Space separated list of ssl errors to ignore."
@@ -4613,12 +4537,16 @@ msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
 
 #: ../src/common/config.py:338
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
 
 #: ../src/common/config.py:341
 msgid "Whitespace sent after inactivity"
@@ -4654,6 +4582,8 @@ msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
 
 #: ../src/common/config.py:368
 msgid "Answer to receipt requests"
@@ -4664,17 +4594,14 @@ msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
 #: ../src/common/config.py:378
-#, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
-"If ticked, Gajim will allow others to detect the operation system you are "
-"using"
+"Allow Gajim to send information about the operating system you are running."
 
 #: ../src/common/config.py:379
-#, fuzzy
 msgid "Allow Gajim to send your local time."
-msgstr "%s wants to send you a file."
+msgstr "Allow Gajim to send your local time."
 
 #: ../src/common/config.py:380
 msgid ""
@@ -4685,25 +4612,28 @@ msgstr ""
 "messages to be logged?"
 
 #: ../src/common/config.py:383
-#, fuzzy
 msgid "Message that is sent to contacts you want to add"
-msgstr "Please fill in the data of the contact you want to add"
+msgstr "Message that is sent to contacts you want to add"
 
 #: ../src/common/config.py:384
 msgid "Last time we syncronized with logs from server."
-msgstr ""
+msgstr "Last time we syncronised with logs from server."
 
 #: ../src/common/config.py:385
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
 
 #: ../src/common/config.py:386
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
 
 #: ../src/common/config.py:448
 msgid "Is OpenPGP enabled for this contact?"
@@ -4727,6 +4657,9 @@ msgid ""
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
+"State whether plugins should be activated on exit (this is saved on Gajim "
+"exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
+"instead."
 
 #: ../src/common/config.py:461 ../src/common/pep.py:157
 msgid "Sleeping"
@@ -4833,9 +4766,8 @@ msgid "marine"
 msgstr "marine"
 
 #: ../src/common/config.py:523
-#, fuzzy
 msgid "Tor"
-msgstr "To"
+msgstr "Tor"
 
 #: ../src/common/connection_handlers_events.py:378
 #, python-format
@@ -4853,15 +4785,15 @@ msgstr "unsubscribe request from %s"
 
 #: ../src/common/connection_handlers_events.py:895
 #: ../src/common/connection_handlers.py:334
-#: ../src/common/connection_handlers.py:941
-#: ../src/common/connection_handlers.py:1053 ../src/common/connection.py:464
+#: ../src/common/connection_handlers.py:947
+#: ../src/common/connection_handlers.py:1059 ../src/common/connection.py:464
 #: ../src/common/logger.py:1129 ../src/gajim.py:392 ../src/session.py:97
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
 #: ../src/common/connection_handlers_events.py:899
-#: ../src/common/connection_handlers.py:944
-#: ../src/common/connection_handlers.py:1056 ../src/common/connection.py:468
+#: ../src/common/connection_handlers.py:950
+#: ../src/common/connection_handlers.py:1062 ../src/common/connection.py:468
 #: ../src/common/logger.py:1132 ../src/gajim.py:211 ../src/session.py:101
 #, python-format
 msgid ""
@@ -5024,7 +4956,7 @@ msgstr "Invisibility not supported"
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../src/common/connection_handlers.py:1715
+#: ../src/common/connection_handlers.py:1721
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
@@ -5269,11 +5201,13 @@ msgstr ""
 "Unknown SSL error: %d"
 
 #: ../src/common/connection.py:1324
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
-msgstr "The authenticity of the %s certificate could be invalid."
+msgstr ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
 
 #: ../src/common/connection.py:1364
 msgid "Check your connection or try again later"
@@ -5285,7 +5219,6 @@ msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
 #: ../src/common/connection.py:1400
-#, fuzzy
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
@@ -5294,7 +5227,7 @@ msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
 #: ../src/common/connection.py:1476
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
@@ -5315,11 +5248,11 @@ msgstr "Sent contacts:"
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2564
+#: ../src/common/connection.py:2565
 msgid "Unregister failed"
 msgstr "Unregister failed"
 
-#: ../src/common/connection.py:2565
+#: ../src/common/connection.py:2566
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Unregistration with server %(server)s failed: %(error)s"
@@ -5357,14 +5290,12 @@ msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus does not run correctly on this machine"
 
 #: ../src/common/dbus_support.py:54
-#, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
-msgstr "D-Bus does not run correctly on this machine"
+msgstr "D-Bus does not run correctly on this machine: system bus not present"
 
 #: ../src/common/dbus_support.py:57
-#, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "D-Bus does not run correctly on this machine"
+msgstr "D-Bus does not run correctly on this machine: session bus not present"
 
 #: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
@@ -5380,22 +5311,22 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus is not present on this machine or python module is missing"
 
 #: ../src/common/exceptions.py:78
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Session bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
 
 #: ../src/common/exceptions.py:90
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "System bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
-"Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"System bus is not available.\n"
+"Try reading %(url)s"
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
@@ -5562,7 +5493,7 @@ msgstr "Weekend!"
 
 #: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Username must be between 1 and 1023 chars"
 
 #: ../src/common/helpers.py:163
 msgid "Invalid character in username."
@@ -5570,7 +5501,7 @@ msgstr "Invalid character in username."
 
 #: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Server must be between 1 and 1023 chars"
 
 #: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
@@ -5582,7 +5513,7 @@ msgstr "Server address required."
 
 #: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Resource must be between 1 and 1023 chars"
 
 #: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
@@ -5613,14 +5544,12 @@ msgid "Free for Chat"
 msgstr "Free for Chat"
 
 #: ../src/common/helpers.py:240
-#, fuzzy
 msgid "?user status:_Available"
-msgstr "Paused"
+msgstr "_Available"
 
 #: ../src/common/helpers.py:242 ../src/tooltips.py:190
-#, fuzzy
 msgid "?user status:Available"
-msgstr "Paused"
+msgstr "Available"
 
 #: ../src/common/helpers.py:244
 msgid "Connecting"
@@ -5821,7 +5750,7 @@ msgstr "Gajim - %s"
 
 #: ../src/common/helpers.py:1361
 msgid "Hello, I am $name."
-msgstr ""
+msgstr "Hello, I am $name."
 
 #: ../src/common/helpers.py:1471 ../src/common/helpers.py:1480
 #: ../src/common/helpers.py:1534
@@ -5833,19 +5762,17 @@ msgid "Image is too big"
 msgstr "Image is too big"
 
 #: ../src/common/helpers.py:1500
-#, fuzzy
 msgid "PyCURL is not installed"
-msgstr "CRL is not yet valid"
+msgstr "PyCURL is not installed"
 
 #: ../src/common/helpers.py:1536
-#, fuzzy
 msgid "Error loading image"
-msgstr "Timeout loading image"
+msgstr "Error loading image"
 
 #: ../src/common/jingle_rtp.py:109
-#, fuzzy, python-format
+#, python-format
 msgid "%s configuration error"
-msgstr "Room Configuration"
+msgstr "%s configuration error"
 
 #: ../src/common/jingle_rtp.py:110
 #, python-format
@@ -5858,33 +5785,42 @@ msgid ""
 "Error was:\n"
 "%s"
 msgstr ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
 
 #: ../src/common/jingle_rtp.py:208
 msgid "GStreamer error"
-msgstr ""
+msgstr "GStreamer error"
 
 #: ../src/common/jingle_rtp.py:208
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
-msgstr "Error message: %s"
+msgstr ""
+"Error: %s\n"
+"Debug: %s"
 
 #: ../src/common/jingle_rtp.py:338
 msgid "audio input"
-msgstr ""
+msgstr "audio input"
 
 #: ../src/common/jingle_rtp.py:341
 msgid "audio output"
-msgstr ""
+msgstr "audio output"
 
 #: ../src/common/jingle_rtp.py:384
 msgid "video input"
-msgstr ""
+msgstr "video input"
 
 #: ../src/common/jingle_rtp.py:393
 msgid "video output"
-msgstr ""
+msgstr "video output"
 
 #: ../src/common/latex.py:109
 #, python-format
@@ -5897,14 +5833,13 @@ msgid "%s is not a valid loglevel"
 msgstr "%s is not a valid loglevel"
 
 #: ../src/common/multimedia_helpers.py:39
-#, fuzzy
 msgid " Default device"
-msgstr "Default Message"
+msgstr " Default device"
 
 #. Test src
 #: ../src/common/multimedia_helpers.py:60
 msgid "Audio test"
-msgstr ""
+msgstr "Audio test"
 
 #. Auto src
 #. Auto sink
@@ -5914,51 +5849,51 @@ msgstr ""
 #: ../src/common/multimedia_helpers.py:93
 #: ../src/common/multimedia_helpers.py:111
 msgid "Autodetect"
-msgstr ""
+msgstr "Autodetect"
 
 #. Alsa src
 #. Alsa sink
 #: ../src/common/multimedia_helpers.py:66
 #: ../src/common/multimedia_helpers.py:81
-#, fuzzy, python-format
+#, python-format
 msgid "ALSA: %s"
-msgstr "Size: %s"
+msgstr "ALSA: %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
 #: ../src/common/multimedia_helpers.py:69
 #: ../src/common/multimedia_helpers.py:83
-#, fuzzy, python-format
+#, python-format
 msgid "Pulse: %s"
-msgstr "File: %s"
+msgstr "Pulse: %s"
 
 #. Fake sink
 #. Fake video output
 #: ../src/common/multimedia_helpers.py:77
 #: ../src/common/multimedia_helpers.py:105
 msgid "Fake audio output"
-msgstr ""
+msgstr "Fake audio output"
 
 #. Test src
 #: ../src/common/multimedia_helpers.py:90
 msgid "Video test"
-msgstr ""
+msgstr "Video test"
 
 #. V4L2 src
 #: ../src/common/multimedia_helpers.py:95
 #, python-format
 msgid "V4L2: %s"
-msgstr ""
+msgstr "V4L2: %s"
 
 #: ../src/common/multimedia_helpers.py:108
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
-msgstr ""
+msgstr "X Window System (X11/XShm/Xv): %s"
 
 #. ximagesink
 #: ../src/common/multimedia_helpers.py:110
 msgid "X Window System (without Xv)"
-msgstr ""
+msgstr "X Window System (without Xv)"
 
 #. we talk about a file
 #. we talk about file
@@ -7013,13 +6948,12 @@ msgid "Removing %s account"
 msgstr "Removing %s account"
 
 #: ../src/config.py:3021
-#, fuzzy
 msgid "Account is disabled"
-msgstr "Emoticons disabled"
+msgstr "Account is disabled"
 
 #: ../src/config.py:3022
 msgid "To unregister from a server, account must be enabled."
-msgstr ""
+msgstr "To unregister from a server, account must be enabled."
 
 #: ../src/config.py:3035 ../src/gui_interface.py:283
 #: ../src/gui_interface.py:706
@@ -7045,23 +6979,21 @@ msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
 #: ../src/config.py:3062
-#, fuzzy, python-format
+#, python-format
 msgid "Connection to server %s failed"
-msgstr "Connection to proxy failed"
+msgstr "Connection to server %s failed"
 
 #: ../src/config.py:3063
-#, fuzzy
 msgid "What would you like to do?"
-msgstr "What do you want to do?"
+msgstr "What would you like to do?"
 
 #: ../src/config.py:3064
-#, fuzzy
 msgid "Remove only from Gajim"
-msgstr "Remove account _only from Gajim"
+msgstr "Remove only from Gajim"
 
 #: ../src/config.py:3065
 msgid "Don't remove anything. I'll try again later"
-msgstr ""
+msgstr "Don't remove anything. I'll try again later"
 
 #: ../src/config.py:3159
 msgid "?print_status:All"
@@ -7190,9 +7122,9 @@ msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
 #: ../src/config.py:4128
-#, fuzzy, python-format
+#, python-format
 msgid "Configure %s"
-msgstr "_Configure"
+msgstr "Configure %s"
 
 #: ../src/config.py:4144 ../src/plugins/gui.py:74
 msgid "Active"
@@ -7293,32 +7225,31 @@ msgid "Open as _Link"
 msgstr "Open as _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1319
-#, fuzzy, python-format
+#: ../src/conversation_textview.py:1323
+#, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Yesterday"
-msgstr[1] "Yesterday"
+msgstr[1] "%(nb_days)i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1368 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1372 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
 #: ../src/dataforms_widget.py:565
-#, fuzzy
 msgid "Unable to load image"
-msgstr "Unable to load idle module"
+msgstr "Unable to load image"
 
 #: ../src/dataforms_widget.py:567
-#, fuzzy, python-format
+#, python-format
 msgid "Media type not supported: %s"
-msgstr "Invisibility not supported"
+msgstr "Media type not supported: %s"
 
 #: ../src/dataforms_widget.py:582
 msgid "This field is required"
-msgstr ""
+msgstr "This field is required"
 
 #: ../src/dataforms_widget.py:627
 msgid "Jabber ID already in list"
@@ -7450,9 +7381,8 @@ msgid "User ID:"
 msgstr "User ID:"
 
 #: ../src/dialogs.py:1273
-#, fuzzy
 msgid "A GTK+ Jabber/XMPP client"
-msgstr "A GTK+ Jabber client"
+msgstr "A GTK+ Jabber/XMPP client"
 
 #: ../src/dialogs.py:1274
 msgid "GTK+ Version:"
@@ -7501,11 +7431,11 @@ msgstr ""
 
 #: ../src/dialogs.py:1877
 msgid "_Resume"
-msgstr ""
+msgstr "_Resume"
 
 #: ../src/dialogs.py:1885
 msgid "Re_place"
-msgstr ""
+msgstr "Re_place"
 
 #: ../src/dialogs.py:2079 ../src/dialogs.py:2479
 msgid "The nickname has not allowed characters."
@@ -7555,9 +7485,8 @@ msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
 #: ../src/dialogs.py:2484
-#, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
-msgstr "The group chat Jabber ID has invalid characters."
+msgstr "Please enter the group chat Jabber ID as room@server."
 
 #: ../src/dialogs.py:2490 ../src/groupchat_control.py:2093
 msgid "The group chat Jabber ID has not allowed characters."
@@ -7729,26 +7658,25 @@ msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
 #: ../src/dialogs.py:3340
-#, fuzzy
 msgid "add"
-msgstr "Sad"
+msgstr "add"
 
 #: ../src/dialogs.py:3340
-#, fuzzy
 msgid "modify"
-msgstr "Modify"
+msgstr "modify"
 
 #: ../src/dialogs.py:3341
-#, fuzzy
 msgid "remove"
-msgstr "Remo_ve"
+msgstr "remove"
 
 #: ../src/dialogs.py:3370
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
-msgstr "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgstr ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
 
 #. Change label for accept_button to action name instead of 'OK'.
 #: ../src/dialogs.py:3388 ../src/dialogs.py:3463
@@ -7771,37 +7699,35 @@ msgid "%s suggested me to add you in my roster."
 msgstr "%s suggested me to add you in my roster."
 
 #: ../src/dialogs.py:3522
-#, fuzzy, python-format
+#, python-format
 msgid "Added  %s contacts"
-msgstr "_Add contact"
+msgstr "Added  %s contacts"
 
 #: ../src/dialogs.py:3559
-#, fuzzy, python-format
+#, python-format
 msgid "Removed  %s contacts"
-msgstr "Removes contact from roster"
+msgstr "Removed  %s contacts"
 
 #: ../src/dialogs.py:3599 ../src/dialogs.py:3776
 #, python-format
 msgid "Archiving Preferences for %s"
-msgstr ""
+msgstr "Archiving Preferences for %s"
 
 #: ../src/dialogs.py:3639
-#, fuzzy
 msgid "Invalid expire value"
-msgstr "Invalid Server Name"
+msgstr "Invalid expire value"
 
 #: ../src/dialogs.py:3640
 msgid "Expire must be a valid positive integer."
-msgstr ""
+msgstr "Expire must be a valid positive integer."
 
 #: ../src/dialogs.py:3687
 msgid "There is an error with the form"
-msgstr ""
+msgstr "There is an error with the form"
 
 #: ../src/dialogs.py:3907
-#, fuzzy
 msgid "There is an error"
-msgstr "Service returned an error."
+msgstr "There is an error"
 
 #: ../src/dialogs.py:3975
 #, python-format
@@ -7872,7 +7798,7 @@ msgstr "Do you want to accept the invitation?"
 
 #: ../src/dialogs.py:4513
 msgid "Choose Client Cert #PCKS12"
-msgstr ""
+msgstr "Choose Client Cert #PCKS12"
 
 #: ../src/dialogs.py:4523 ../src/dialogs.py:4565 ../src/dialogs.py:4621
 #: ../src/dialogs.py:4709
@@ -7881,7 +7807,7 @@ msgstr "All files"
 
 #: ../src/dialogs.py:4528
 msgid "PKCS12 Files"
-msgstr ""
+msgstr "PKCS12 Files"
 
 #: ../src/dialogs.py:4555
 msgid "Choose Sound"
@@ -7900,14 +7826,12 @@ msgid "Images"
 msgstr "Images"
 
 #: ../src/dialogs.py:4696
-#, fuzzy
 msgid "Choose Archive"
-msgstr "Choose Image"
+msgstr "Choose Archive"
 
 #: ../src/dialogs.py:4714
-#, fuzzy
 msgid "Zip files"
-msgstr "All files"
+msgstr "Zip files"
 
 #: ../src/dialogs.py:4740
 #, python-format
@@ -8012,15 +7936,15 @@ msgstr ""
 
 #: ../src/dialogs.py:5121
 msgid "an audio and video"
-msgstr ""
+msgstr "an audio and video"
 
 #: ../src/dialogs.py:5123
 msgid "an audio"
-msgstr ""
+msgstr "an audio"
 
 #: ../src/dialogs.py:5125
 msgid "a video"
-msgstr ""
+msgstr "a video"
 
 #: ../src/dialogs.py:5129
 #, python-format
@@ -8028,11 +7952,13 @@ msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
 
 #: ../src/dialogs.py:5197
-#, fuzzy, python-format
+#, python-format
 msgid "Certificate for account %s"
-msgstr "for account %s"
+msgstr "Certificate for account %s"
 
 #: ../src/dialogs.py:5197
 #, python-format
@@ -8055,10 +7981,27 @@ msgid ""
 "<b>Fingerprint</b>\n"
 "SHA1 Fingerprint: %(sha1)s"
 msgstr ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organisation (O): %(sorg)s\n"
+"Organisationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organisation (O): %(iorg)s\n"
+"Organisationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
 
 #: ../src/dialogs.py:5231 ../src/dialogs.py:5248
 msgid "View cert..."
-msgstr ""
+msgstr "View cert..."
 
 #: ../src/disco.py:119
 msgid "Others"
@@ -8185,7 +8128,6 @@ msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
 #: ../src/features_window.py:50
-#, fuzzy
 msgid "SSL certificate validation"
 msgstr "SSL certificate validation"
 
@@ -8196,9 +8138,8 @@ msgstr ""
 "A library used to validate server certificates to ensure a secure connection."
 
 #: ../src/features_window.py:52 ../src/features_window.py:53
-#, fuzzy
 msgid "Requires python-pyopenssl > 0.12 and pyasn1."
-msgstr "Requires python-pyopenssl."
+msgstr "Requires python-pyopenssl > 0.12 and pyasn1."
 
 #: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
@@ -8217,6 +8158,8 @@ msgid ""
 "Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
 "opensource/)."
 msgstr ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
 
 #: ../src/features_window.py:58
 msgid "Command line"
@@ -8248,10 +8191,11 @@ msgstr "Encrypting chat messages with gpg keys."
 #: ../src/features_window.py:64
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
+"Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 
 #: ../src/features_window.py:65
 msgid "Requires gpg.exe in PATH."
-msgstr ""
+msgstr "Requires gpg.exe in PATH."
 
 #: ../src/features_window.py:66
 msgid "Network-manager"
@@ -8318,9 +8262,8 @@ msgid "Requires libgtkspell."
 msgstr "Requires libgtkspell."
 
 #: ../src/features_window.py:85
-#, fuzzy
 msgid "Requires libgtkspell and libenchant."
-msgstr "Requires libgtkspell."
+msgstr "Requires libgtkspell and libenchant."
 
 #: ../src/features_window.py:86
 msgid "Notification"
@@ -8363,22 +8306,20 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transform LaTeX expressions between $$ $$."
 
 #: ../src/features_window.py:96
-#, fuzzy
 msgid ""
 "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
-"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
-"in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
 
 #: ../src/features_window.py:97
-#, fuzzy
 msgid ""
 "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
 "You have to set 'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
-"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
+"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
+"You have to set 'use_latex' to True in the Advanced Configuration Editor."
 
 #: ../src/features_window.py:98
 msgid "End to End message encryption"
@@ -8410,41 +8351,37 @@ msgstr "Requires python-docutils."
 
 #: ../src/features_window.py:107
 msgid "Ability to start audio and video chat."
-msgstr ""
+msgstr "Ability to start audio and video chat."
 
 #: ../src/features_window.py:108
-#, fuzzy
 msgid "Requires python-farsight and gstreamer-plugins-bad."
-msgstr "Requires python-avahi."
+msgstr "Requires python-farsight and gstreamer-plugins-bad."
 
 #: ../src/features_window.py:110
 msgid "UPnP-IGD"
-msgstr ""
+msgstr "UPnP-IGD"
 
 #: ../src/features_window.py:111
 msgid "Ability to request your router to forward port for file transfer."
-msgstr ""
+msgstr "Ability to request your router to forward port for file transfer."
 
 #: ../src/features_window.py:112
-#, fuzzy
 msgid "Requires python-gupnp-igd."
-msgstr "Requires python-gnome2."
+msgstr "Requires python-gupnp-igd."
 
 #: ../src/features_window.py:114
 msgid "UPower"
-msgstr ""
+msgstr "UPower"
 
 #: ../src/features_window.py:115
 msgid "Ability to disconnect properly just before suspending the machine."
-msgstr ""
+msgstr "Ability to disconnect properly just before suspending the machine."
 
 #: ../src/features_window.py:116
-#, fuzzy
 msgid "Requires upower and python-dbus."
-msgstr "Requires python-dbus."
+msgstr "Requires upower and python-dbus."
 
 #: ../src/features_window.py:124
-#, fuzzy
 msgid "?features:Available"
 msgstr "Available"
 
@@ -8629,24 +8566,20 @@ msgid "importing PyGTK failed: %s"
 msgstr "importing PyGTK failed: %s"
 
 #: ../src/gajim.py:237
-#, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim needs PyGTK 2.12 or above"
+msgstr "Gajim needs PyGTK 2.16 or above"
 
 #: ../src/gajim.py:238
-#, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgstr "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 
 #: ../src/gajim.py:240
-#, fuzzy
 msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim needs GTK 2.12 or above"
+msgstr "Gajim needs GTK 2.16 or above"
 
 #: ../src/gajim.py:241
-#, fuzzy
 msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgstr "Gajim needs GTK 2.16 or above to run. Quiting..."
 
 #: ../src/gajim.py:250
 msgid "Gajim needs pywin32 to run"
@@ -8732,11 +8665,12 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-#, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
-msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
+msgstr ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 
 #: ../src/gajim-remote.py:110
 msgid "status message"
@@ -8960,23 +8894,20 @@ msgstr ""
 "all accounts"
 
 #: ../src/gajim-remote.py:268
-#, fuzzy
 msgid "Change the avatar"
-msgstr "Change status"
+msgstr "Change the avatar"
 
 #: ../src/gajim-remote.py:270
-#, fuzzy
 msgid "Picture to use"
-msgstr "Nickname to use"
+msgstr "Picture to use"
 
 #: ../src/gajim-remote.py:271
-#, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr ""
-"Account in which the xml will be sent; if not specified, xml will be sent to "
-"all accounts"
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
 
 #: ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
@@ -9106,7 +9037,7 @@ msgstr ""
 
 #: ../src/gajim-remote.py:539
 msgid "No uri given"
-msgstr ""
+msgstr "No uri given"
 
 #: ../src/gajim-remote.py:541
 msgid "Wrong uri"
@@ -9165,9 +9096,9 @@ msgid "Continued conversation"
 msgstr "Continued conversation"
 
 #: ../src/groupchat_control.py:1225
-#, fuzzy, python-format
+#, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
-msgstr "%(jid)s has set the subject to %(subject)s"
+msgstr "%(nick)s has set the subject to %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #: ../src/groupchat_control.py:1243 ../src/groupchat_control.py:1510
@@ -9313,9 +9244,8 @@ msgstr ""
 #: ../src/gui_interface.py:1373 ../src/message_window.py:224
 #: ../src/roster_window.py:2989 ../src/roster_window.py:3667
 #: ../src/roster_window.py:4473
-#, fuzzy
 msgid "_Do not ask me again"
-msgstr "Do _not ask me again"
+msgstr "_Do not ask me again"
 
 #: ../src/groupchat_control.py:2059
 msgid "Changing Subject"
@@ -9476,28 +9406,28 @@ msgid "A Password is required to join the room %s. Please type it."
 msgstr "A Password is required to join the room %s. Please type it."
 
 #: ../src/gui_interface.py:296
-#, fuzzy, python-format
+#, python-format
 msgid "Maximum number of users for <b>%s</b> has been reached"
-msgstr "Maximum number of users for %s has been reached"
+msgstr "Maximum number of users for <b>%s</b> has been reached"
 
 #: ../src/gui_interface.py:305
-#, fuzzy, python-format
+#, python-format
 msgid "You are banned from group chat <b>%s</b>."
-msgstr "You are banned from group chat %s."
+msgstr "You are banned from group chat <b>%s</b>."
 
 #: ../src/gui_interface.py:311
-#, fuzzy, python-format
+#, python-format
 msgid "Group chat <b>%s</b> does not exist."
-msgstr "Group chat %s does not exist."
+msgstr "Group chat <b>%s</b> does not exist."
 
 #: ../src/gui_interface.py:314
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
 #: ../src/gui_interface.py:317
-#, fuzzy, python-format
+#, python-format
 msgid "Your registered nickname must be used in group chat <b>%s</b>."
-msgstr "Your registered nickname must be used in group chat %s."
+msgstr "Your registered nickname must be used in group chat <b>%s</b>."
 
 #: ../src/gui_interface.py:322
 #, python-format
@@ -9565,14 +9495,13 @@ msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passphrase Incorrect"
 
 #: ../src/gui_interface.py:653
-#, fuzzy
 msgid "Certificate Passphrase Required"
-msgstr "Certificate has expired"
+msgstr "Certificate Passphrase Required"
 
 #: ../src/gui_interface.py:654
-#, fuzzy, python-format
+#, python-format
 msgid "Enter the passphrase for the certificate for account %s"
-msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "Enter the passphrase for the certificate for account %s"
 
 #: ../src/gui_interface.py:676
 msgid "GPG key not trusted"
@@ -9587,13 +9516,12 @@ msgstr ""
 "encrypt this message?"
 
 #: ../src/gui_interface.py:689
-#, fuzzy
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
 msgstr ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 
 #: ../src/gui_interface.py:796
 #, python-format
@@ -9675,14 +9603,13 @@ msgstr ""
 
 #. TODO: we should use another pixmap ;-)
 #: ../src/gui_interface.py:1118
-#, fuzzy, python-format
+#, python-format
 msgid "%s wants to start a voice chat."
-msgstr "%s wants to send you a file."
+msgstr "%s wants to start a voice chat."
 
 #: ../src/gui_interface.py:1121
-#, fuzzy
 msgid "Voice Chat Request"
-msgstr "File Transfer Request"
+msgstr "Voice Chat Request"
 
 #: ../src/gui_interface.py:1208
 msgid "Error verifying SSL certificate"
@@ -9730,15 +9657,17 @@ msgid "Insecure connection"
 msgstr "Insecure connection"
 
 #: ../src/gui_interface.py:1284
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) with an "
 "insecure connection. This means all your conversations will be exchanged "
 "unencrypted. This type of connection is really discouraged.\n"
 "Are you sure you want to do that?"
 msgstr ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
 
 #: ../src/gui_interface.py:1290 ../src/gui_interface.py:1331
 #: ../src/gui_interface.py:1372
@@ -9747,7 +9676,7 @@ msgstr "Yes, I really want to connect insecurely"
 
 #: ../src/gui_interface.py:1291
 msgid "Gajim will NOT connect unless you check this box"
-msgstr ""
+msgstr "Gajim will NOT connect unless you tick this box"
 
 #: ../src/gui_interface.py:1328
 msgid ""
@@ -9758,13 +9687,12 @@ msgstr ""
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 
 #: ../src/gui_interface.py:1370
-#, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
 
 #. theme doesn't exist, disable emoticons
 #: ../src/gui_interface.py:1878 ../src/gui_interface.py:1901
@@ -9813,9 +9741,9 @@ msgid "GPG key expired"
 msgstr "GPG key expired"
 
 #: ../src/gui_interface.py:2911
-#, fuzzy, python-format
+#, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
-msgstr "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Your GPG key has expired, you will be connected to %s without OpenPGP."
 
 #. ask again
 #: ../src/gui_interface.py:2920
@@ -9888,9 +9816,8 @@ msgstr ""
 "In case you click YES, please wait..."
 
 #: ../src/history_manager.py:259
-#, fuzzy
 msgid "Database Cleanup"
-msgstr "Database Error"
+msgstr "Database Cleanup"
 
 #: ../src/history_manager.py:477
 msgid "Exporting History Logs..."
@@ -9902,23 +9829,21 @@ msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
 #: ../src/history_manager.py:592
-#, fuzzy, python-format
+#, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
-msgstr "Do you really want to delete the selected message?"
+msgstr "Do you really want to delete the logs of %(jid)s?"
 
 #: ../src/history_manager.py:596
-#, fuzzy
 msgid "Do you really want to delete logs of the selected contacts?"
-msgstr "Do you really want to delete the logs of the selected contact?"
+msgstr "Do you really want to delete logs of the selected contacts?"
 
 #: ../src/history_manager.py:598 ../src/history_manager.py:637
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
 #: ../src/history_manager.py:600 ../src/history_manager.py:639
-#, fuzzy
 msgid "Deletion Confirmation"
-msgstr "Cancel confirmation"
+msgstr "Deletion Confirmation"
 
 #: ../src/history_manager.py:634
 msgid "Do you really want to delete the selected message?"
@@ -9960,9 +9885,8 @@ msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
 #: ../src/htmltextview.py:522
-#, fuzzy
 msgid "Loading"
-msgstr "Coding"
+msgstr "Loading"
 
 #: ../src/message_window.py:222
 msgid "You are going to close several tabs"
@@ -10002,49 +9926,44 @@ msgstr "Ignore"
 
 #: ../src/plugins/gui.py:68
 msgid "Plugin"
-msgstr ""
+msgstr "Plugin"
 
 #: ../src/plugins/gui.py:162
-#, fuzzy
 msgid "Plugin failed"
-msgstr "Registration failed"
+msgstr "Plugin failed"
 
 #: ../src/plugins/gui.py:206
 msgid "Unable to properly remove the plugin"
-msgstr ""
+msgstr "Unable to properly remove the plugin"
 
 #. members not safe
 #: ../src/plugins/gui.py:214 ../src/plugins/pluginmanager.py:519
 #: ../src/plugins/pluginmanager.py:527
-#, fuzzy
 msgid "Archive is malformed"
-msgstr "Service sent malformed data"
+msgstr "Archive is malformed"
 
 #: ../src/plugins/gui.py:237 ../src/plugins/gui.py:245
 #: ../src/plugins/pluginmanager.py:535
-#, fuzzy
 msgid "Plugin already exists"
-msgstr "This file already exists"
+msgstr "Plugin already exists"
 
 #: ../src/plugins/gui.py:237
 msgid "Overwrite?"
-msgstr ""
+msgstr "Overwrite?"
 
 #: ../src/plugins/gui.py:266
-#, fuzzy
 msgid "Configuration"
-msgstr "Room Configuration"
+msgstr "Configuration"
 
 #. it is not zip file
 #. CRC error
 #: ../src/plugins/pluginmanager.py:505 ../src/plugins/pluginmanager.py:511
 msgid "Archive corrupted"
-msgstr ""
+msgstr "Archive corrupted"
 
 #: ../src/plugins/pluginmanager.py:507
-#, fuzzy
 msgid "Archive empty"
-msgstr "File is empty"
+msgstr "Archive empty"
 
 #: ../src/profile_window.py:60
 msgid "Retrieving profile..."
@@ -10066,14 +9985,12 @@ msgid "Could not load image"
 msgstr "Could not load image"
 
 #: ../src/profile_window.py:229
-#, fuzzy
 msgid "Wrong date format"
-msgstr "Personal Information"
+msgstr "Wrong date format"
 
 #: ../src/profile_window.py:230
-#, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+msgstr "Format of the date must be YYYY-MM-DD"
 
 #: ../src/profile_window.py:284
 msgid "Information received"
@@ -10172,15 +10089,16 @@ msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
 #: ../src/roster_window.py:2455
-#, fuzzy
 msgid "You have running file transfers"
-msgstr "Cancel file transfer"
+msgstr "You have running file transfers"
 
 #: ../src/roster_window.py:2456
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
+"If you quit now, the file(s) being transferred will be stopped. Do you still "
+"want to quit?"
 
 #: ../src/roster_window.py:2487 ../src/roster_window.py:2903
 msgid "You have unread messages"
@@ -10326,20 +10244,19 @@ msgstr ""
 "you also remove authorisation resulting in them always seeing you as offline."
 
 #: ../src/roster_window.py:3661
-#, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr ""
-"You are about to send a custom status. Are you sure you want to continue?"
+"You are about to send a custom status. Are you sure you want  to continue?"
 
 #: ../src/roster_window.py:3663
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 msgstr ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then they will see your global status."
+"change your status. Then he or she will see your global status."
 
 #: ../src/roster_window.py:3682
 msgid "No account available"
@@ -10394,9 +10311,9 @@ msgid "Send %s to %s"
 msgstr "Send %s to %s"
 
 #: ../src/roster_window.py:4748
-#, fuzzy, python-format
+#, python-format
 msgid "Make %s first contact"
-msgstr "Make %s and %s metacontacts"
+msgstr "Make %s first contact"
 
 #: ../src/roster_window.py:4751
 #, python-format
@@ -10451,9 +10368,8 @@ msgid "Publish Tune"
 msgstr "Publish Tune"
 
 #: ../src/roster_window.py:5460
-#, fuzzy
 msgid "Publish Location"
-msgstr "Publish Tune"
+msgstr "Publish Location"
 
 #: ../src/roster_window.py:5463
 msgid "Configure Services..."
@@ -10553,7 +10469,7 @@ msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
 #: ../src/session.py:416
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The remote client wants to negotiate a session with these features:\n"
 "\n"
@@ -10561,11 +10477,11 @@ msgid ""
 "\n"
 "Are these options acceptable?"
 msgstr ""
-"The remote client wants to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 
 #: ../src/session.py:475
 #, python-format
@@ -10583,18 +10499,16 @@ msgstr ""
 "Continue with the session?"
 
 #: ../src/session.py:478
-#, fuzzy
 msgid "Always accept for this contact"
-msgstr "Is OpenPGP enabled for this contact?"
+msgstr "Always accept for this contact"
 
 #: ../src/statusicon.py:228
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
 #: ../src/statusicon.py:342
-#, fuzzy
 msgid "Hide _Roster"
-msgstr "in _roster"
+msgstr "Hide _Roster"
 
 #: ../src/statusicon.py:353
 msgid "Hide this menu"
@@ -10653,34 +10567,34 @@ msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
 #: ../src/tooltips.py:647
-#, fuzzy, python-format
+#, python-format
 msgid "Idle since %s"
-msgstr " since %s"
+msgstr "Idle since %s"
 
 #: ../src/tooltips.py:648
-#, fuzzy, python-format
+#, python-format
 msgid "Idle for %s"
-msgstr "XML Console for %s"
+msgstr "Idle for %s"
 
 #: ../src/tooltips.py:699
-#, fuzzy, python-format
+#, python-format
 msgid "Mood: %s"
-msgstr "Mood:"
+msgstr "Mood: %s"
 
 #: ../src/tooltips.py:703
-#, fuzzy, python-format
+#, python-format
 msgid "Activity: %s"
-msgstr "Activity:"
+msgstr "Activity: %s"
 
 #: ../src/tooltips.py:707
-#, fuzzy, python-format
+#, python-format
 msgid "Tune: %s"
-msgstr "Tune:"
+msgstr "Tune: %s"
 
 #: ../src/tooltips.py:711
-#, fuzzy, python-format
+#, python-format
 msgid "Location: %s"
-msgstr "Notification"
+msgstr "Location: %s"
 
 #: ../src/tooltips.py:736
 msgid "Download"
@@ -10737,7 +10651,7 @@ msgstr ""
 
 #: ../src/upower_listener.py:31
 msgid "Machine going to sleep"
-msgstr ""
+msgstr "Machine going to sleep"
 
 #: ../src/vcard.py:285
 msgid "?Client:Unknown"
@@ -10758,7 +10672,7 @@ msgstr "since %s"
 
 #: ../src/vcard.py:367
 msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr ""
+msgstr "<b>Role:</b>"
 
 #: ../src/vcard.py:371
 msgid "<b>Affiliation:</b>"
@@ -10806,13 +10720,12 @@ msgstr "There is no pending subscription request."
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#~ msgid "Disk WriteError"
-#~ msgstr "Disk WriteError"
-
 #~ msgid "error: cannot open %s for reading"
 #~ msgstr "error: cannot open %s for reading"
 
-#, fuzzy
+#~ msgid "Disk WriteError"
+#~ msgstr "Disk WriteError"
+
 #~ msgid "Choose Client Cert"
 #~ msgstr "Choose File to Send..."
 
@@ -10837,34 +10750,27 @@ msgstr " resource with priority "
 #~ msgid "Busy "
 #~ msgstr "Busy "
 
-#, fuzzy
 #~ msgid "Contact Change Status "
 #~ msgstr "Contact Changed Status"
 
-#, fuzzy
 #~ msgid "Contact Disconnected "
 #~ msgstr "Contact Disconnected"
 
 #~ msgid "Don't have "
 #~ msgstr "Don't have "
 
-#, fuzzy
 #~ msgid "File Transfer Finished"
 #~ msgstr "File Transfers"
 
-#, fuzzy
 #~ msgid "File Transfer Request "
 #~ msgstr "File Transfer Request"
 
-#, fuzzy
 #~ msgid "File Transfer Started "
 #~ msgstr "File Transfer Stopped"
 
-#, fuzzy
 #~ msgid "Group Chat Message Highlight "
 #~ msgstr "Group Chat Message Highlight"
 
-#, fuzzy
 #~ msgid "Group Chat Message Received "
 #~ msgstr "Group Chat Message Received"
 
@@ -10883,7 +10789,6 @@ msgstr " resource with priority "
 #~ msgid "Play a sound"
 #~ msgstr "Play a sound"
 
-#, fuzzy
 #~ msgid "Receive a Message"
 #~ msgstr "New Private Message"
 
@@ -10906,7 +10811,6 @@ msgstr " resource with priority "
 #~ msgid "_Disable existing sound for this event"
 #~ msgstr "_Disable existing sound for this event"
 
-#, fuzzy
 #~ msgid "_Disable showing event in notification area"
 #~ msgstr "_Disable showing event in roster"
 
@@ -10919,7 +10823,6 @@ msgstr " resource with priority "
 #~ msgid "_Open chat window with user"
 #~ msgstr "_Open chat window with user"
 
-#, fuzzy
 #~ msgid "_Show event in notification area"
 #~ msgstr "_Show event in roster"
 
@@ -10929,21 +10832,18 @@ msgstr " resource with priority "
 #~ msgid "and I "
 #~ msgstr "and I "
 
-#, fuzzy
 #~ msgid "contact(s)"
 #~ msgstr "Contacts"
 
 #~ msgid "for "
 #~ msgstr "for "
 
-#, fuzzy
 #~ msgid "group(s)"
 #~ msgstr "Groups"
 
 #~ msgid "when I'm in"
 #~ msgstr "when I'm in"
 
-#, fuzzy
 #~ msgid "Descrition:"
 #~ msgstr "Description: "
 
@@ -10980,11 +10880,9 @@ msgstr " resource with priority "
 #~ msgid "Requires gpg and python-GnuPGInterface."
 #~ msgstr "Requires gpg and python-GnuPGInterface."
 
-#, fuzzy
 #~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 #~ msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#, fuzzy
 #~ msgid ""
 #~ "Returns current status message(the global one unless account is specified)"
 #~ msgstr ""
@@ -10998,7 +10896,6 @@ msgstr " resource with priority "
 #~ "Usage: %s %s %s \n"
 #~ "\t %s"
 
-#, fuzzy
 #~ msgid ""
 #~ "Too many arguments. \n"
 #~ "Type \"%s help %s\" for more info"
@@ -11006,7 +10903,6 @@ msgstr " resource with priority "
 #~ "Too many arguments. \n"
 #~ "Type \"%(basename)s help %(command)s\" for more info"
 
-#, fuzzy
 #~ msgid ""
 #~ "Argument \"%s\" is not specified. \n"
 #~ "Type \"%s help %s\" for more info"
@@ -11026,15 +10922,12 @@ msgstr " resource with priority "
 #~ msgid "_Show event in systray"
 #~ msgstr "_Show event in systray"
 
-#, fuzzy
 #~ msgid "Always use GNOME default applications"
 #~ msgstr "Always use OS/X default applications"
 
-#, fuzzy
 #~ msgid "Always use Xfce default applications"
 #~ msgstr "Always use OS/X default applications"
 
-#, fuzzy
 #~ msgid "Autodetect on every Gajim startup"
 #~ msgstr "C_onnect on Gajim startup"
 
@@ -11518,7 +11411,6 @@ msgstr " resource with priority "
 #~ msgstr ""
 #~ "No such command: /%s (if you want to send this, prefix it with /say)"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: /%s <action>, sends action to the current group chat. Use third "
 #~ "person. (e.g. /%s explodes.)"
@@ -11526,11 +11418,9 @@ msgstr " resource with priority "
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
 
-#, fuzzy
 #~ msgid "Encryption enabled"
 #~ msgstr "E2E encryption enabled"
 
-#, fuzzy
 #~ msgid "Encryption disabled"
 #~ msgstr "E2E encryption disabled"