diff --git a/po/de.po b/po/de.po
index c8ad56fc..c3a276a5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -451,7 +451,7 @@ msgstr "Es kann kein Standard-Editor geöffnet werden."
 #: ../../src/client/geary-args.vala:52
 #, c-format
 msgid "Failed to parse command line options: %s\n"
-msgstr "Die Kommandozeilenargumente konnten nicht interpretiert werden: %s\n"
+msgstr "Die Kommandozeilenargumente konnten nicht interpretiert werden: %s\\n"
 
 #: ../../src/client/composer/composer-window.vala:340
 msgid "Fixed width"
@@ -483,7 +483,7 @@ msgstr "Von:"
 #: ../../src/engine/rfc822/rfc822-utils.vala:78
 #, c-format
 msgid "From: %s\n"
-msgstr "Von: %s\n"
+msgstr "Von: %s\\n"
 
 #: ../../src/client/util/util-files.vala:22
 msgctxt "Abbreviation for gigabyte"
@@ -958,7 +958,7 @@ msgstr "An:"
 #: ../../src/engine/rfc822/rfc822-utils.vala:83
 #, c-format
 msgid "To: %s\n"
-msgstr "An: %s\n"
+msgstr "An: %s\\n"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:43
 msgid "Trash"
@@ -997,7 +997,7 @@ msgstr "Unterstreichen (Strg+U)"
 #: ../../src/client/geary-args.vala:63
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
-msgstr "Unbekanntes Kommandozeilenargument \"%s\"\n"
+msgstr "Unbekanntes Kommandozeilenargument \"%s\"\\n"
 
 #: ../../ui/login.glade:460
 msgid "User_name:"
diff --git a/po/gl.po b/po/gl.po
index 7d1e3589..ca549757 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,14 +4,14 @@
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
-# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012.
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.3.0\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n"
 "POT-Creation-Date: 2013-02-26 16:16-0800\n"
-"PO-Revision-Date: 2013-02-27 00:48+0000\n"
-"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
+"PO-Revision-Date: 2013-03-07 19:44+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
@@ -21,56 +21,56 @@ msgstr ""
 
 #: ../../src/client/accounts/add-edit-page.vala:621
 msgid "        &#8226; Connection error.\n"
-msgstr ""
+msgstr "        &#8226; Produciuse un erro de conexión.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:608
 msgid "        &#8226; IMAP connection error.\n"
-msgstr ""
+msgstr "        &#8226; Produciuse un erro de conexión IMAP.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:611
 msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr ""
+msgstr "        &#8226; Nome de usuario ou contrasinal de IMAP incorrecto.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:604
 msgid "        &#8226; Invalid account nickname.\n"
-msgstr ""
+msgstr "        &#8226; Alcume da conta incorrecto.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:614
 msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+msgstr "        &#8226; Produciuse un erro de conexión SMTP.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:617
 msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+msgstr "        &#8226; Nome de usuario ou contrasinal de SMTP incorrecto.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:625
 msgid "        &#8226; Username or password incorrect.\n"
-msgstr ""
+msgstr "        &#8226; Nome de usuario ou contrasinal incorrecto.\n"
 
 #: ../../src/client/composer/composer-window.vala:650
 #, c-format
 msgid "\"%s\" already attached for delivery."
-msgstr ""
+msgstr "«%s» xa foi anexado para o envío."
 
 #: ../../src/client/composer/composer-window.vala:619
 #, c-format
 msgid "\"%s\" could not be found."
-msgstr ""
+msgstr "Non foi posíbel atopar «%s»."
 
 #: ../../src/client/composer/composer-window.vala:644
 #, c-format
 msgid "\"%s\" could not be opened for reading."
-msgstr ""
+msgstr "Non foi posíbel abrir «%s» para a súa lectura."
 
 #: ../../src/client/composer/composer-window.vala:625
 #, c-format
 msgid "\"%s\" is a folder."
-msgstr ""
+msgstr "«%s» é un cartafol."
 
 #: ../../src/client/composer/composer-window.vala:631
 #, c-format
 msgid "\"%s\" is an empty file."
-msgstr ""
+msgstr "«%s» é un ficheiro baleiro."
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -120,8 +120,8 @@ msgstr[1] "%d mensaxes novas"
 #, c-format
 msgid "%d unread message"
 msgid_plural "%d unread messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d mensaxe sen ler\t"
+msgstr[1] "%d mensaxes non lidas"
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -141,18 +141,18 @@ msgstr "%l:%M %P"
 #: ../../src/client/folder-list/folder-list-folder-entry.vala:24
 #, c-format
 msgid "%s (%d)"
-msgstr ""
+msgstr "%s (%d)"
 
 #: ../../src/client/views/conversation-web-view.vala:326
 #, c-format
 msgid "%s - Conversation Inspector"
-msgstr ""
+msgstr "%s - Inspector de conversas"
 
 #: ../../src/client/notification/libindicate.vala:59
 #: ../../src/client/notification/libmessagingmenu.vala:75
 #, c-format
 msgid "%s - New Messages"
-msgstr ""
+msgstr "%s - Mensaxes novas"
 
 #: ../../src/engine/rfc822/rfc822-utils.vala:48
 #, c-format
@@ -167,7 +167,7 @@ msgstr "%u conversas seleccionadas."
 #: ../../src/client/views/conversation-viewer.vala:383
 #, c-format
 msgid "%u read messages"
-msgstr ""
+msgstr "%u mensaxes lidas"
 
 #. / Date format for dates within a different year, i.e. 02/04/10
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -186,39 +186,44 @@ msgstr "---------- Mensaxe reenviada ----------"
 
 #: ../../src/client/accounts/add-edit-page.vala:205
 msgid "1 month back"
-msgstr ""
+msgstr "Hai 1 mes"
 
 #: ../../src/client/accounts/add-edit-page.vala:208
 msgid "1 year back"
-msgstr ""
+msgstr "Hai 1 ano"
 
 #: ../../src/client/accounts/add-edit-page.vala:204
 msgid "2 weeks back"
-msgstr ""
+msgstr "Hai 2 semanas"
 
 #: ../../src/client/accounts/add-edit-page.vala:206
 msgid "3 months back"
-msgstr ""
+msgstr "Hai 3 meses"
 
 #: ../../src/client/accounts/add-edit-page.vala:207
 msgid "6 months back"
-msgstr ""
+msgstr "Hai 6 meses"
 
 #: ../../ui/remove_confirm.glade:46
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
 "account?</span> "
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">Confirma que quere retirar esta conta?"
+"</span> "
 
 #: ../../ui/account_cannot_remove.glade:41
 msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">Non é posíbel eliminar a conta</span> "
 
 #: ../../ui/account_cannot_remove.glade:57
 msgid ""
 "A composer window associated with this account is currently open. Send or "
 "discard the message and try again."
 msgstr ""
+"Xa ten aberta unha xanela de redacción asociada a esta conta. Envíe ou "
+"desbote a mensaxe e ténteo de novo."
 
 #: ../../src/client/geary-controller.vala:1068
 #, c-format
@@ -227,7 +232,7 @@ msgstr "Xa existe un ficheiro co nome «%s».  Desexa substituílo?"
 
 #: ../../src/client/geary-controller.vala:170
 msgid "A_ccounts"
-msgstr ""
+msgstr "_Contas"
 
 #: ../../src/client/geary-controller.vala:783
 #, c-format
@@ -236,19 +241,19 @@ msgstr "Sobre %s"
 
 #: ../../src/client/accounts/account-dialog.vala:19
 msgid "Accounts"
-msgstr ""
+msgstr "Contas"
 
 #: ../../ui/account_list.glade:73
 msgid "Add an account"
-msgstr ""
+msgstr "Engadir unha conta nova"
 
 #: ../../src/client/geary-controller.vala:49
 msgid "Add label to conversation"
-msgstr ""
+msgstr "Engadir etiqueta á conversa"
 
 #: ../../src/client/geary-controller.vala:50
 msgid "Add label to conversations"
-msgstr ""
+msgstr "Engadir etiqueta ás conversas"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:37
 msgid "All Mail"
@@ -259,18 +264,20 @@ msgid ""
 "All email associated with this account will be removed from your computer. "
 "This will not affect email on the server."
 msgstr ""
+"Todo o correo asociado a esta conta vai ser retirado do seu computador. Isto "
+"non afectará ao correo no servidor."
 
 #: ../../src/client/geary-args.vala:23
 msgid "Allow inspection of WebView"
-msgstr ""
+msgstr "Permitir a inspección de WebView"
 
 #: ../../src/client/geary-controller.vala:40
 msgid "Archive conversation (Delete, Backspace, A)"
-msgstr ""
+msgstr "Arquivar a conversa (Supr, Retroceso, A)"
 
 #: ../../src/client/geary-controller.vala:41
 msgid "Archive conversations (Delete, Backspace, A)"
-msgstr ""
+msgstr "Arquivar as conversas (Supr, Retroceso, A)"
 
 #: ../../src/client/geary-controller.vala:1054
 #, c-format
@@ -296,7 +303,7 @@ msgstr "Negra"
 #. Toggle bold text
 #: ../../ui/composer.glade:428
 msgid "Bold (Ctrl+B)"
-msgstr ""
+msgstr "Negra (Ctrl+B)"
 
 #: ../../ui/composer.glade:68
 msgid "C_olor"
@@ -325,7 +332,7 @@ msgstr "Cor"
 #. Opens font color dialog
 #: ../../ui/composer.glade:560
 msgid "Color (Ctrl+R)"
-msgstr ""
+msgstr "Cor (Ctrl+R)"
 
 #: ../../src/client/geary-application.vala:28
 #: ../../src/client/notification/libindicate.vala:34
@@ -350,7 +357,7 @@ msgstr "Copiar a _ligazón"
 
 #: ../../src/client/geary-application.vala:17
 msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr ""
+msgstr "Copyright 2011-2013 Yorba Foundation"
 
 #: ../../src/client/views/conversation-viewer.vala:250
 msgid "Date:"
@@ -363,7 +370,7 @@ msgstr "Data: %s\n"
 
 #: ../../src/engine/api/geary-account-information.vala:30
 msgid "Default"
-msgstr ""
+msgstr "Predeterminado"
 
 #: ../../ui/toolbar.glade:155
 msgid "Delete"
@@ -371,11 +378,11 @@ msgstr "Eliminar"
 
 #: ../../src/client/geary-controller.vala:35
 msgid "Delete conversation (Delete, Backspace, A)"
-msgstr ""
+msgstr "Eliminar a conversa (Supr, Retroceso, A)"
 
 #: ../../src/client/geary-controller.vala:36
 msgid "Delete conversations (Delete, Backspace, A)"
-msgstr ""
+msgstr "Eliminar as conversas (Supr, Retroceso, A)"
 
 #: ../../src/client/geary-args.vala:24
 msgid "Display program version"
@@ -399,15 +406,15 @@ msgstr "Arrastre os ficheiros cara aquí"
 
 #: ../../ui/account_list.glade:87
 msgid "Edit an account"
-msgstr ""
+msgstr "Editar unha conta"
 
 #: ../../ui/remove_confirm.glade:97
 msgid "Email address:"
-msgstr ""
+msgstr "Enderezo de correo:"
 
 #: ../../src/client/geary-application.vala:27
 msgid "Email;E-mail;Mail"
-msgstr ""
+msgstr "Correo electrónico;Correo-e;Correo"
 
 #: ../../ui/preferences.glade:137
 msgid "Enable _spell checking"
@@ -427,7 +434,7 @@ msgstr "Introduza a información da súa conta para comezar. "
 
 #: ../../src/client/accounts/add-edit-page.vala:210
 msgid "Everything"
-msgstr ""
+msgstr "Todo"
 
 #: ../../src/client/views/conversation-viewer.vala:1236
 msgid "Failed to open default text editor."
@@ -493,7 +500,7 @@ msgstr "Configuración de IMAP"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:34
 msgid "Important"
-msgstr ""
+msgstr "Importante"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:22
 msgid "Inbox"
@@ -501,7 +508,7 @@ msgstr "Bandexa de entrada"
 
 #: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
 msgid "Inboxes"
-msgstr ""
+msgstr "Bandexas de entrada"
 
 #: ../../ui/composer.glade:495
 msgid "Indent"
@@ -510,7 +517,7 @@ msgstr "Sangría"
 #. Indent text
 #: ../../ui/composer.glade:494
 msgid "Indent (Ctrl+])"
-msgstr ""
+msgstr "Sangría (Ctrl+])"
 
 #: ../../ui/composer.glade:443
 msgid "Italic"
@@ -519,7 +526,7 @@ msgstr "Itálica"
 #. Toggle italic text
 #: ../../ui/composer.glade:442
 msgid "Italic (Ctrl+I)"
-msgstr ""
+msgstr "Itálica (Ctrl+I)"
 
 #: ../../src/client/util/util-files.vala:28
 msgctxt "Abbreviation for kilobyte"
@@ -549,7 +556,7 @@ msgstr "Ligazón"
 #. Add an HTML link
 #: ../../ui/composer.glade:574
 msgid "Link (Ctrl+L)"
-msgstr ""
+msgstr "Ligazón (Ctrl+L)"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
@@ -607,19 +614,19 @@ msgstr "Marcar como _sen ler"
 
 #: ../../src/client/geary-controller.vala:45
 msgid "Mark as not s_pam"
-msgstr ""
+msgstr "Marcar como correo non li_xo"
 
 #: ../../src/client/geary-controller.vala:44
 msgid "Mark as s_pam"
-msgstr ""
+msgstr "Marcar como correo li_xo"
 
 #: ../../src/client/geary-controller.vala:47
 msgid "Mark conversation"
-msgstr ""
+msgstr "Marcar a conversa"
 
 #: ../../src/client/geary-controller.vala:48
 msgid "Mark conversations"
-msgstr ""
+msgstr "Marcar as conversas"
 
 #: ../../src/client/views/formatted-conversation-data.vala:9
 msgid "Me"
@@ -635,15 +642,15 @@ msgstr "Menú"
 
 #: ../../src/client/folder-list/folder-list-account-branch.vala:19
 msgid "More"
-msgstr ""
+msgstr "Máis"
 
 #: ../../src/client/geary-controller.vala:51
 msgid "Move conversation"
-msgstr ""
+msgstr "Mover a conversa"
 
 #: ../../src/client/geary-controller.vala:52
 msgid "Move conversations"
-msgstr ""
+msgstr "Mover as conversas"
 
 #: ../../ui/toolbar.glade:131
 msgid "Move to"
@@ -655,7 +662,7 @@ msgstr "N_ome:"
 
 #: ../../ui/login.glade:233
 msgid "N_ickname:"
-msgstr ""
+msgstr "Alc_ume:"
 
 #: ../../src/client/composer/composer-window.vala:15
 msgid "New Message"
@@ -663,11 +670,11 @@ msgstr "Mensaxe nova"
 
 #: ../../ui/remove_confirm.glade:83
 msgid "Nickname:"
-msgstr ""
+msgstr "Alcume:"
 
 #: ../../ui/login.glade:664
 msgid "No authentication re_quired"
-msgstr ""
+msgstr "Non se re_quire autenticación"
 
 #: ../../src/client/views/conversation-viewer.vala:158
 msgid "No conversations selected."
@@ -730,7 +737,7 @@ msgstr "Envíe comentarios, suxestións e fallos a:"
 
 #: ../../ui/account_spinner.glade:41
 msgid "Please wait while Geary validates your account."
-msgstr ""
+msgstr "Agarde mentres Geary confirma a súa conta."
 
 #: ../../ui/login.glade:424
 msgid "Por_t:"
@@ -763,11 +770,11 @@ msgstr "Limpar o formato"
 #. Resets formatting to the default style
 #: ../../ui/composer.glade:588
 msgid "Remove formatting (Ctrl+Space)"
-msgstr ""
+msgstr "Retirar o formato (Ctrl+Espazo)"
 
 #: ../../ui/toolbar.glade:43
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #: ../../ui/toolbar.glade:60
 msgid "Reply All"
@@ -775,7 +782,7 @@ msgstr "Responder a todos"
 
 #: ../../src/client/geary-controller.vala:246
 msgid "Reply _all"
-msgstr ""
+msgstr "Responder a _todos"
 
 #: ../../src/client/views/conversation-viewer.vala:787
 msgid "Reply to _All"
@@ -785,14 +792,15 @@ msgstr "Responder a _todos"
 msgid ""
 "Reply to everyone in last message of conversation (Ctrl+Shift+R, Shift+R)"
 msgstr ""
+"Responder a todos na última mensaxe da conversa (Ctrl+Maiús+R, Maiús+R)"
 
 #: ../../ui/toolbar.glade:40
 msgid "Reply to last message in conversation (Ctrl+R, R)"
-msgstr ""
+msgstr "Responder á última mensaxe da conversa  (Ctrl+R, R)"
 
 #: ../../ui/composer.glade:147
 msgid "Rich Text"
-msgstr ""
+msgstr "Texto mellorado"
 
 #: ../../ui/password-dialog.glade:162
 msgid "SMTP Credentials"
@@ -804,7 +812,7 @@ msgstr "Configuración do SMTP"
 
 #: ../../src/client/dialogs/password-dialog.vala:121
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: ../../ui/password-dialog.glade:381 ../../ui/password-dialog.glade:484
 msgid "SSL/TLS encryption:"
@@ -812,7 +820,7 @@ msgstr "Cifrado SSL/TLS:"
 
 #: ../../src/client/dialogs/password-dialog.vala:123
 msgid "STARTTLS"
-msgstr ""
+msgstr "STARTTLS"
 
 #: ../../src/client/composer/composer-window.vala:333
 msgid "Sans Serif"
@@ -834,7 +842,7 @@ msgstr "Se_rvidor:"
 
 #: ../../src/client/composer/composer-window.vala:915
 msgid "Select Color"
-msgstr ""
+msgstr "Escoller unha cor"
 
 #: ../../src/client/views/conversation-viewer.vala:546
 msgid "Select _All"
@@ -846,11 +854,11 @@ msgstr "Enviar e recibir correo"
 
 #: ../../ui/toolbar.glade:74
 msgid "Send copy of last message in conversation (Ctrl+L, F)"
-msgstr ""
+msgstr "Enviar copia d última mensaxe da conversa  (Ctrl+L, F)"
 
 #: ../../src/client/composer/composer-window.vala:568
 msgid "Send message with an empty subject and/or body?"
-msgstr ""
+msgstr "Enviar a mensaxe co asunto e/ou corpo baleiro?"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:28
 msgid "Sent Mail"
@@ -891,11 +899,11 @@ msgstr "Destacados"
 #. Button for creating a new email message
 #: ../../ui/toolbar.glade:12
 msgid "Start new conversation (Ctrl+N, N)"
-msgstr ""
+msgstr "Iniciar unha conversa (Ctrl+N, N)"
 
 #: ../../ui/login.glade:764
 msgid "Storage"
-msgstr ""
+msgstr "Almacenamento"
 
 #: ../../ui/composer.glade:471
 msgid "Strikethrough"
@@ -904,7 +912,7 @@ msgstr "Riscado"
 #. Toggle strikethrough text
 #: ../../ui/composer.glade:470
 msgid "Strikethrough (Ctrl+K)"
-msgstr ""
+msgstr "Riscado (Ctrl+K)"
 
 #: ../../src/client/views/conversation-viewer.vala:247
 msgid "Subject:"
@@ -913,7 +921,7 @@ msgstr "Asunto:"
 #: ../../src/engine/rfc822/rfc822-utils.vala:79
 #, c-format
 msgid "Subject: %s\n"
-msgstr ""
+msgstr "Asunto: %s\n"
 
 #: ../../src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
@@ -959,7 +967,7 @@ msgstr "Eliminar a sangría"
 #. Removes an indent level
 #: ../../ui/composer.glade:508
 msgid "Un-indent (Ctrl+[)"
-msgstr ""
+msgstr "Eliminar a sangría (Ctrl+[)"
 
 #: ../../src/client/dialogs/password-dialog.vala:17
 msgid "Unable to login to email server"
@@ -967,7 +975,7 @@ msgstr "Non foi posíbel identificarse diante do servidor de correo: "
 
 #: ../../src/client/accounts/add-edit-page.vala:602
 msgid "Unable to validate:\n"
-msgstr ""
+msgstr "Non foi posíbel confirmar:\n"
 
 #: ../../ui/composer.glade:457
 msgid "Underline"
@@ -976,7 +984,7 @@ msgstr "Subliñado"
 #. Toggle underlined text
 #: ../../ui/composer.glade:456
 msgid "Underline (Ctrl+U)"
-msgstr ""
+msgstr "Subliñado (Ctrl+U)"
 
 #: ../../src/client/geary-args.vala:63
 #, c-format
@@ -1024,7 +1032,7 @@ msgstr "_Sobre"
 
 #: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
 msgid "_Add"
-msgstr ""
+msgstr "_Engadir"
 
 #: ../../src/client/geary-controller.vala:39
 msgid "_Archive"
@@ -1036,7 +1044,7 @@ msgstr "_Anexar"
 
 #: ../../ui/composer.glade:663
 msgid "_Attach File"
-msgstr ""
+msgstr "_Anexar un ficheiro"
 
 #: ../../ui/preferences.glade:71
 msgid "_Automatically select next message"
@@ -1068,7 +1076,7 @@ msgstr "_Amosar a vista previa das mensaxes"
 
 #: ../../ui/login.glade:785
 msgid "_Download mail:"
-msgstr ""
+msgstr "_Descargar o correo:"
 
 #: ../../ui/login.glade:117
 msgid "_Email address:"
@@ -1085,7 +1093,7 @@ msgstr "_Axuda"
 
 #: ../../src/client/views/conversation-viewer.vala:552
 msgid "_Inspect"
-msgstr ""
+msgstr "_Inspeccionar"
 
 #: ../../ui/composer.glade:55
 msgid "_Justify"
@@ -1138,11 +1146,11 @@ msgstr "_Saír"
 
 #: ../../ui/password-dialog.glade:560
 msgid "_Remember passwords"
-msgstr ""
+msgstr "_Lembrar os contrasinais"
 
 #: ../../ui/account_cannot_remove.glade:75 ../../ui/remove_confirm.glade:171
 msgid "_Remove"
-msgstr ""
+msgstr "_Retirar"
 
 #: ../../src/client/geary-controller.vala:1073
 msgid "_Replace"
@@ -1159,7 +1167,7 @@ msgstr "_Dereita"
 
 #: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
 msgid "_Save"
-msgstr ""
+msgstr "_Gardar"
 
 #: ../../src/client/views/conversation-viewer.vala:749
 msgid "_Save As..."
@@ -1202,7 +1210,7 @@ msgstr "ningún"
 #: ../../ui/account_list.glade:74 ../../ui/account_list.glade:88
 #: ../../ui/account_list.glade:101
 msgid "toolbutton1"
-msgstr ""
+msgstr "botónferramenta1"
 
 #. / Translators: add your name and email address to receive credit in the About dialog
 #. / For example: Yamada Taro <yamada.taro@example.com>
diff --git a/po/he.po b/po/he.po
index 142e97dc..af4ec510 100644
--- a/po/he.po
+++ b/po/he.po
@@ -5,14 +5,15 @@
 #
 # Translators:
 # Dovix Dovix <dovix2003@gmail.com>, 2012.
+# Ofek Lavie <ofeklavie@gmail.com>, 2013.
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.3.0\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n"
 "POT-Creation-Date: 2013-02-26 16:16-0800\n"
-"PO-Revision-Date: 2013-02-27 00:48+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"PO-Revision-Date: 2013-03-12 09:40+0000\n"
+"Last-Translator: Megolas <ofeklavie@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@ msgstr ""
 
 #: ../../src/client/accounts/add-edit-page.vala:621
 msgid "        &#8226; Connection error.\n"
-msgstr ""
+msgstr "&#8226; בעיית חיבור.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:608
 msgid "        &#8226; IMAP connection error.\n"
@@ -30,7 +31,7 @@ msgstr ""
 
 #: ../../src/client/accounts/add-edit-page.vala:611
 msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr ""
+msgstr "&#8226; שם משתמש או סיסמאת ה-IMAP שגויים.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:604
 msgid "        &#8226; Invalid account nickname.\n"
@@ -66,12 +67,12 @@ msgstr ""
 #: ../../src/client/composer/composer-window.vala:625
 #, c-format
 msgid "\"%s\" is a folder."
-msgstr ""
+msgstr "\"%s\" היא תיקייה."
 
 #: ../../src/client/composer/composer-window.vala:631
 #, c-format
 msgid "\"%s\" is an empty file."
-msgstr ""
+msgstr "\"%s\" הוא קובץ ריק."
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -142,7 +143,7 @@ msgstr "%l:%M %P"
 #: ../../src/client/folder-list/folder-list-folder-entry.vala:24
 #, c-format
 msgid "%s (%d)"
-msgstr ""
+msgstr "%s (%d)"
 
 #: ../../src/client/views/conversation-web-view.vala:326
 #, c-format
@@ -168,7 +169,7 @@ msgstr "נבחרו %u  תכתובות."
 #: ../../src/client/views/conversation-viewer.vala:383
 #, c-format
 msgid "%u read messages"
-msgstr ""
+msgstr "%u הודעות שנקראו"
 
 #. / Date format for dates within a different year, i.e. 02/04/10
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -187,39 +188,41 @@ msgstr "---------- הודעה שהועברה ----------"
 
 #: ../../src/client/accounts/add-edit-page.vala:205
 msgid "1 month back"
-msgstr ""
+msgstr "חודש 1 אחורנית"
 
 #: ../../src/client/accounts/add-edit-page.vala:208
 msgid "1 year back"
-msgstr ""
+msgstr "שנה 1 אחורנית"
 
 #: ../../src/client/accounts/add-edit-page.vala:204
 msgid "2 weeks back"
-msgstr ""
+msgstr "שבועיים אחורנית"
 
 #: ../../src/client/accounts/add-edit-page.vala:206
 msgid "3 months back"
-msgstr ""
+msgstr "3 חודשים אחורנית"
 
 #: ../../src/client/accounts/add-edit-page.vala:207
 msgid "6 months back"
-msgstr ""
+msgstr "שישה חודשים אחורנית"
 
 #: ../../ui/remove_confirm.glade:46
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
 "account?</span> "
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">את בטוח שאתה רוצה למחוק את המשתמש?</"
+"span>"
 
 #: ../../ui/account_cannot_remove.glade:41
 msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
+msgstr "<span weight=\"bold\" size=\"larger\">לא מסוגל למחוק משתמש</span>"
 
 #: ../../ui/account_cannot_remove.glade:57
 msgid ""
 "A composer window associated with this account is currently open. Send or "
 "discard the message and try again."
-msgstr ""
+msgstr "חלון כתיבה הקשור במשתמש זה פתוח כרגע. שלח או מחק את ההודעה ונסה שוב."
 
 #: ../../src/client/geary-controller.vala:1068
 #, c-format
@@ -237,19 +240,19 @@ msgstr "על אודות %s"
 
 #: ../../src/client/accounts/account-dialog.vala:19
 msgid "Accounts"
-msgstr ""
+msgstr "משתמשים"
 
 #: ../../ui/account_list.glade:73
 msgid "Add an account"
-msgstr ""
+msgstr "הוסף משתמש"
 
 #: ../../src/client/geary-controller.vala:49
 msgid "Add label to conversation"
-msgstr ""
+msgstr "הוסף תווית לשיחה"
 
 #: ../../src/client/geary-controller.vala:50
 msgid "Add label to conversations"
-msgstr ""
+msgstr "הוסף תווית לשיחות"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:37
 msgid "All Mail"
@@ -260,6 +263,8 @@ msgid ""
 "All email associated with this account will be removed from your computer. "
 "This will not affect email on the server."
 msgstr ""
+"כל ההודעות הקשורות במשתמש זה יוסרו ממחשבך. התהליך לא ישפיע על ההודעות שבשרת "
+"הדוא\"ל."
 
 #: ../../src/client/geary-args.vala:23
 msgid "Allow inspection of WebView"
@@ -351,7 +356,7 @@ msgstr "העתקת _קישור"
 
 #: ../../src/client/geary-application.vala:17
 msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr ""
+msgstr "כל הזכויות שמורות 2011-2013 Yorba Foundation"
 
 #: ../../src/client/views/conversation-viewer.vala:250
 msgid "Date:"
@@ -364,7 +369,7 @@ msgstr "תאריך: %s\n"
 
 #: ../../src/engine/api/geary-account-information.vala:30
 msgid "Default"
-msgstr ""
+msgstr "ברירת מחדל"
 
 #: ../../ui/toolbar.glade:155
 msgid "Delete"
@@ -372,7 +377,7 @@ msgstr "מחיקה"
 
 #: ../../src/client/geary-controller.vala:35
 msgid "Delete conversation (Delete, Backspace, A)"
-msgstr ""
+msgstr "מחק שיחה (Delete, Backspace, ש)"
 
 #: ../../src/client/geary-controller.vala:36
 msgid "Delete conversations (Delete, Backspace, A)"
@@ -400,11 +405,11 @@ msgstr "יש לגרור קבצים לכאן"
 
 #: ../../ui/account_list.glade:87
 msgid "Edit an account"
-msgstr ""
+msgstr "עורך משתמש"
 
 #: ../../ui/remove_confirm.glade:97
 msgid "Email address:"
-msgstr ""
+msgstr "כתובת דוא\"ל:"
 
 #: ../../src/client/geary-application.vala:27
 msgid "Email;E-mail;Mail"
@@ -428,7 +433,7 @@ msgstr "נא להזין את פרטי החשבון שלך כדי להתחיל."
 
 #: ../../src/client/accounts/add-edit-page.vala:210
 msgid "Everything"
-msgstr ""
+msgstr "הכל"
 
 #: ../../src/client/views/conversation-viewer.vala:1236
 msgid "Failed to open default text editor."
@@ -494,7 +499,7 @@ msgstr "הגדרות IMAP"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:34
 msgid "Important"
-msgstr ""
+msgstr "חשוב"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:22
 msgid "Inbox"
@@ -502,7 +507,7 @@ msgstr "דואר נכנס"
 
 #: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
 msgid "Inboxes"
-msgstr ""
+msgstr "תיבות דואר נכנס"
 
 #: ../../ui/composer.glade:495
 msgid "Indent"
@@ -608,19 +613,19 @@ msgstr "סימון כ_לא נקרא"
 
 #: ../../src/client/geary-controller.vala:45
 msgid "Mark as not s_pam"
-msgstr ""
+msgstr "סמן כלא ספאם"
 
 #: ../../src/client/geary-controller.vala:44
 msgid "Mark as s_pam"
-msgstr ""
+msgstr "סמן כספאם"
 
 #: ../../src/client/geary-controller.vala:47
 msgid "Mark conversation"
-msgstr ""
+msgstr "סמן שיחה"
 
 #: ../../src/client/geary-controller.vala:48
 msgid "Mark conversations"
-msgstr ""
+msgstr "סמן שיחות"
 
 #: ../../src/client/views/formatted-conversation-data.vala:9
 msgid "Me"
@@ -636,15 +641,15 @@ msgstr "תפריט"
 
 #: ../../src/client/folder-list/folder-list-account-branch.vala:19
 msgid "More"
-msgstr ""
+msgstr "עוד"
 
 #: ../../src/client/geary-controller.vala:51
 msgid "Move conversation"
-msgstr ""
+msgstr "הזז שיחה"
 
 #: ../../src/client/geary-controller.vala:52
 msgid "Move conversations"
-msgstr ""
+msgstr "הזז שיחות"
 
 #: ../../ui/toolbar.glade:131
 msgid "Move to"
@@ -664,7 +669,7 @@ msgstr "הודעה חדשה"
 
 #: ../../ui/remove_confirm.glade:83
 msgid "Nickname:"
-msgstr ""
+msgstr "כינוי:"
 
 #: ../../ui/login.glade:664
 msgid "No authentication re_quired"
@@ -768,7 +773,7 @@ msgstr ""
 
 #: ../../ui/toolbar.glade:43
 msgid "Reply"
-msgstr ""
+msgstr "הגב"
 
 #: ../../ui/toolbar.glade:60
 msgid "Reply All"
@@ -776,7 +781,7 @@ msgstr "להשיב לכולם"
 
 #: ../../src/client/geary-controller.vala:246
 msgid "Reply _all"
-msgstr ""
+msgstr "השב לכולם"
 
 #: ../../src/client/views/conversation-viewer.vala:787
 msgid "Reply to _All"
@@ -805,7 +810,7 @@ msgstr "הגדרות SMTP"
 
 #: ../../src/client/dialogs/password-dialog.vala:121
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #: ../../ui/password-dialog.glade:381 ../../ui/password-dialog.glade:484
 msgid "SSL/TLS encryption:"
@@ -835,7 +840,7 @@ msgstr "_שרת:"
 
 #: ../../src/client/composer/composer-window.vala:915
 msgid "Select Color"
-msgstr ""
+msgstr "בחר צבע"
 
 #: ../../src/client/views/conversation-viewer.vala:546
 msgid "Select _All"
@@ -851,7 +856,7 @@ msgstr ""
 
 #: ../../src/client/composer/composer-window.vala:568
 msgid "Send message with an empty subject and/or body?"
-msgstr ""
+msgstr "האם לשלוח את ההודעה ללא כותרת ו/או תוכן?"
 
 #: ../../src/engine/api/geary-special-folder-type.vala:28
 msgid "Sent Mail"
@@ -892,11 +897,11 @@ msgstr "מסומן בכוכב"
 #. Button for creating a new email message
 #: ../../ui/toolbar.glade:12
 msgid "Start new conversation (Ctrl+N, N)"
-msgstr ""
+msgstr "התחל שיחה חדשה: (Ctrl+מ, מ)"
 
 #: ../../ui/login.glade:764
 msgid "Storage"
-msgstr ""
+msgstr "אחסון"
 
 #: ../../ui/composer.glade:471
 msgid "Strikethrough"
@@ -914,7 +919,7 @@ msgstr "נושא:"
 #: ../../src/engine/rfc822/rfc822-utils.vala:79
 #, c-format
 msgid "Subject: %s\n"
-msgstr ""
+msgstr "נושא: %s\n"
 
 #: ../../src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
@@ -1024,7 +1029,7 @@ msgstr "על _אודות"
 
 #: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
 msgid "_Add"
-msgstr ""
+msgstr "הוסף"
 
 #: ../../src/client/geary-controller.vala:39
 msgid "_Archive"
@@ -1068,7 +1073,7 @@ msgstr "הצגת תצוגה מ_קדימה של ההודעה"
 
 #: ../../ui/login.glade:785
 msgid "_Download mail:"
-msgstr ""
+msgstr "הורד דוא\"ל"
 
 #: ../../ui/login.glade:117
 msgid "_Email address:"
@@ -1085,7 +1090,7 @@ msgstr "עזרה"
 
 #: ../../src/client/views/conversation-viewer.vala:552
 msgid "_Inspect"
-msgstr ""
+msgstr "בחן"
 
 #: ../../ui/composer.glade:55
 msgid "_Justify"
@@ -1138,11 +1143,11 @@ msgstr "י_ציאה"
 
 #: ../../ui/password-dialog.glade:560
 msgid "_Remember passwords"
-msgstr ""
+msgstr "זכור סיסמאות"
 
 #: ../../ui/account_cannot_remove.glade:75 ../../ui/remove_confirm.glade:171
 msgid "_Remove"
-msgstr ""
+msgstr "הסר"
 
 #: ../../src/client/geary-controller.vala:1073
 msgid "_Replace"
@@ -1159,7 +1164,7 @@ msgstr "_ימין"
 
 #: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
 msgid "_Save"
-msgstr ""
+msgstr "שמור"
 
 #: ../../src/client/views/conversation-viewer.vala:749
 msgid "_Save As..."
diff --git a/po/hr.po b/po/hr.po
index 4541beb4..30592f78 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: geary-0.3.0\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n"
 "POT-Creation-Date: 2013-02-26 16:16-0800\n"
-"PO-Revision-Date: 2013-03-01 07:42+0000\n"
+"PO-Revision-Date: 2013-03-06 02:00+0000\n"
 "Last-Translator: bmarkovic <bmarkovic.79@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: hr\n"
@@ -103,7 +103,7 @@ msgstr "%H:%M"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/engine/rfc822/rfc822-utils.vala:43
 msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %-e. %b, %Y u %H:%M"
+msgstr "%a, %-e. %b, %Y u %H:%M %p"
 
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
diff --git a/po/ja_JP.po b/po/ja_JP.po
index c95a6cc9..03546da1 100644
--- a/po/ja_JP.po
+++ b/po/ja_JP.po
@@ -4,14 +4,15 @@
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
+# masami chikahiro <cmasa.z321@gmail.com>, 2013.
 # Minato Kanzaki <pikatenor@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.3.0\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n"
 "POT-Creation-Date: 2013-02-26 16:16-0800\n"
-"PO-Revision-Date: 2013-03-04 09:51+0000\n"
-"Last-Translator: pikatenor <pikatenor@gmail.com>\n"
+"PO-Revision-Date: 2013-03-11 00:05+0000\n"
+"Last-Translator: masami chikahiro <cmasa.z321@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja_JP\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +145,7 @@ msgstr "%s (%d)"
 #: ../../src/client/views/conversation-web-view.vala:326
 #, c-format
 msgid "%s - Conversation Inspector"
-msgstr ""
+msgstr "%s - スレッド検証"
 
 #: ../../src/client/notification/libindicate.vala:59
 #: ../../src/client/notification/libmessagingmenu.vala:75
@@ -420,11 +421,11 @@ msgstr "スペルチェックを有効(_S)"
 
 #: ../../ui/login.glade:591
 msgid "Encr_yption:"
-msgstr "暗号化(_Y)"
+msgstr "暗号化(_Y):"
 
 #: ../../ui/login.glade:610
 msgid "Encrypt_ion:"
-msgstr "暗号化(_I)"
+msgstr "暗号化(_I):"
 
 #: ../../src/client/accounts/add-edit-page.vala:185
 msgid "Enter your account information to get started."
@@ -441,7 +442,7 @@ msgstr "テキストエディターの起動に失敗しました"
 #: ../../src/client/geary-args.vala:52
 #, c-format
 msgid "Failed to parse command line options: %s\n"
-msgstr "不明なオプション: %s\n"
+msgstr "不明なコマンドラインオプション: %s\n"
 
 #: ../../src/client/composer/composer-window.vala:340
 msgid "Fixed width"
@@ -612,11 +613,11 @@ msgstr "未読としてマーク(_U)"
 
 #: ../../src/client/geary-controller.vala:45
 msgid "Mark as not s_pam"
-msgstr "迷惑メールのマークを解除"
+msgstr "迷惑メールのマークを解除(_P)"
 
 #: ../../src/client/geary-controller.vala:44
 msgid "Mark as s_pam"
-msgstr "迷惑メールとしてマーク"
+msgstr "迷惑メールとしてマーク(_P)"
 
 #: ../../src/client/geary-controller.vala:47
 msgid "Mark conversation"
@@ -656,11 +657,11 @@ msgstr "移動先"
 
 #: ../../ui/login.glade:178
 msgid "N_ame:"
-msgstr "名前(_A)"
+msgstr "名前(_A):"
 
 #: ../../ui/login.glade:233
 msgid "N_ickname:"
-msgstr "ニックネーム(_I)"
+msgstr "ニックネーム(_I):"
 
 #: ../../src/client/composer/composer-window.vala:15
 msgid "New Message"
@@ -672,7 +673,7 @@ msgstr "ニックネーム:"
 
 #: ../../ui/login.glade:664
 msgid "No authentication re_quired"
-msgstr "暗号化は必要とされていません(_Q)"
+msgstr "認証は必要とされていません(_Q)"
 
 #: ../../src/client/views/conversation-viewer.vala:158
 msgid "No conversations selected."
@@ -711,11 +712,11 @@ msgstr "デバッグ情報を出力"
 
 #: ../../ui/login.glade:340
 msgid "P_ort:"
-msgstr "ポート(_O)"
+msgstr "ポート(_O):"
 
 #: ../../ui/login.glade:477
 msgid "Pass_word:"
-msgstr "パスワード(_W)"
+msgstr "パスワード(_W):"
 
 #: ../../ui/password-dialog.glade:195
 msgid "Password:"
@@ -813,7 +814,7 @@ msgstr "SSL"
 
 #: ../../ui/password-dialog.glade:381 ../../ui/password-dialog.glade:484
 msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS 暗号化"
+msgstr "SSL/TLS 暗号化:"
 
 #: ../../src/client/dialogs/password-dialog.vala:123
 msgid "STARTTLS"
@@ -1022,7 +1023,7 @@ msgstr "設定がセキュアでありません"
 
 #: ../../src/client/geary-controller.vala:183
 msgid "_About"
-msgstr "このアプリケーションについて"
+msgstr "このアプリケーションについて(_A)"
 
 #: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
 msgid "_Add"
@@ -1050,7 +1051,7 @@ msgstr "キャンセル(_C)"
 
 #: ../../ui/composer.glade:49
 msgid "_Center"
-msgstr "中央揃え"
+msgstr "中央揃え(_C)"
 
 #: ../../src/client/views/conversation-viewer.vala:526
 msgid "_Copy"
@@ -1058,7 +1059,7 @@ msgstr "コピー(_C)"
 
 #: ../../src/client/geary-controller.vala:34
 msgid "_Delete"
-msgstr "削除(_C)"
+msgstr "削除(_D)"
 
 #: ../../ui/password-dialog.glade:547
 msgid "_Details"
@@ -1070,11 +1071,11 @@ msgstr "メッセージのプレビューを表示(_D)"
 
 #: ../../ui/login.glade:785
 msgid "_Download mail:"
-msgstr ""
+msgstr "メールをダウンロード(_D):"
 
 #: ../../ui/login.glade:117
 msgid "_Email address:"
-msgstr "メールアドレス(_E)"
+msgstr "メールアドレス(_E):"
 
 #: ../../src/client/geary-controller.vala:252
 #: ../../src/client/views/conversation-viewer.vala:792
@@ -1091,7 +1092,7 @@ msgstr "検証(_I)"
 
 #: ../../ui/composer.glade:55
 msgid "_Justify"
-msgstr "両端揃え"
+msgstr "両端揃え(_J)"
 
 #: ../../src/client/geary-controller.vala:225
 msgid "_Label"
@@ -1099,7 +1100,7 @@ msgstr "ラベル(_L)"
 
 #: ../../ui/composer.glade:37
 msgid "_Left"
-msgstr "左揃え"
+msgstr "左揃え(_L)"
 
 #: ../../src/client/views/conversation-viewer.vala:802
 msgid "_Mark as Read"
@@ -1124,7 +1125,7 @@ msgstr "新規作成(_N)"
 #: ../../ui/login.glade:133 ../../ui/login.glade:542
 #: ../../ui/password-dialog.glade:84
 msgid "_Password:"
-msgstr "パスワード(_P)"
+msgstr "パスワード(_P):"
 
 #: ../../ui/preferences.glade:180
 msgid "_Play notification sounds"
@@ -1157,7 +1158,7 @@ msgstr "返信(_R)"
 
 #: ../../ui/composer.glade:43
 msgid "_Right"
-msgstr "右揃え"
+msgstr "右揃え(_R)"
 
 #: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
 msgid "_Save"
@@ -1165,7 +1166,7 @@ msgstr "保存(_S)"
 
 #: ../../src/client/views/conversation-viewer.vala:749
 msgid "_Save As..."
-msgstr "名前を付けて保存(_S)"
+msgstr "名前を付けて保存(_S)..."
 
 #: ../../ui/composer.glade:696
 msgid "_Send"
diff --git a/po/pl.po b/po/pl.po
index 96bef68d..5ca6a3a3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: geary-0.3.0\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n"
 "POT-Creation-Date: 2013-02-26 16:16-0800\n"
-"PO-Revision-Date: 2013-02-28 19:04+0000\n"
+"PO-Revision-Date: 2013-03-17 12:04+0000\n"
 "Last-Translator: Piotrek Dąbrowski <admin@puredev.eu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pl\n"
@@ -40,44 +40,44 @@ msgstr "&#8226; Login lub hasło IMAP jest niepoprawny.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:604
 msgid "        &#8226; Invalid account nickname.\n"
-msgstr ""
+msgstr "&#8226; Błędna etykieta konta.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:614
 msgid "        &#8226; SMTP connection error.\n"
-msgstr ""
+msgstr "&#8226; Błąd połączenia z SMTP.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:617
 msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr ""
+msgstr "&#8226; Podane login i hasło do SMTP są niepoprawne.\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:625
 msgid "        &#8226; Username or password incorrect.\n"
-msgstr ""
+msgstr "&#8226; Login lub hasło są niepoprawne.\n"
 
 #: ../../src/client/composer/composer-window.vala:650
 #, c-format
 msgid "\"%s\" already attached for delivery."
-msgstr ""
+msgstr "\"%s\" został już załączony do wiadomości."
 
 #: ../../src/client/composer/composer-window.vala:619
 #, c-format
 msgid "\"%s\" could not be found."
-msgstr ""
+msgstr "\"%s\" nie został znaleziony."
 
 #: ../../src/client/composer/composer-window.vala:644
 #, c-format
 msgid "\"%s\" could not be opened for reading."
-msgstr ""
+msgstr "Plik \"%s\" nie mógł być otwarty do odczytu."
 
 #: ../../src/client/composer/composer-window.vala:625
 #, c-format
 msgid "\"%s\" is a folder."
-msgstr ""
+msgstr "\"%s\" to katalog."
 
 #: ../../src/client/composer/composer-window.vala:631
 #, c-format
 msgid "\"%s\" is an empty file."
-msgstr ""
+msgstr "\"%s\" to pusty plik."
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -128,9 +128,9 @@ msgstr[2] "%d nowych wiadomości"
 #, c-format
 msgid "%d unread message"
 msgid_plural "%d unread messages"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d nieprzeczytana wiadomość"
+msgstr[1] "%d nieprzeczytane wiadomości"
+msgstr[2] "%d nieprzeczytych wiadomości"
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -150,12 +150,12 @@ msgstr "%l:%M %P"
 #: ../../src/client/folder-list/folder-list-folder-entry.vala:24
 #, c-format
 msgid "%s (%d)"
-msgstr ""
+msgstr "%s (%d)"
 
 #: ../../src/client/views/conversation-web-view.vala:326
 #, c-format
 msgid "%s - Conversation Inspector"
-msgstr ""
+msgstr "%s - Inspektor wiadomości"
 
 #: ../../src/client/notification/libindicate.vala:59
 #: ../../src/client/notification/libmessagingmenu.vala:75
@@ -195,23 +195,23 @@ msgstr "---------- Przekazywana wiadomość ----------"
 
 #: ../../src/client/accounts/add-edit-page.vala:205
 msgid "1 month back"
-msgstr "1 miesiąc temu"
+msgstr "miesiąca"
 
 #: ../../src/client/accounts/add-edit-page.vala:208
 msgid "1 year back"
-msgstr "1 rok temu"
+msgstr "roku"
 
 #: ../../src/client/accounts/add-edit-page.vala:204
 msgid "2 weeks back"
-msgstr "2 tyg. temu"
+msgstr "2 tygodni"
 
 #: ../../src/client/accounts/add-edit-page.vala:206
 msgid "3 months back"
-msgstr "3 miesiące temu"
+msgstr "3 miesięcy"
 
 #: ../../src/client/accounts/add-edit-page.vala:207
 msgid "6 months back"
-msgstr "6 miesięcy temu"
+msgstr "6 miesięcy"
 
 #: ../../ui/remove_confirm.glade:46
 msgid ""
@@ -230,6 +230,8 @@ msgid ""
 "A composer window associated with this account is currently open. Send or "
 "discard the message and try again."
 msgstr ""
+"Ekran edycji powiązany z tym kontem jest już otwarty. Wyślij lub odrzuć "
+"wiadomość i spróbuj ponownie."
 
 #: ../../src/client/geary-controller.vala:1068
 #, c-format
@@ -275,7 +277,7 @@ msgstr ""
 
 #: ../../src/client/geary-args.vala:23
 msgid "Allow inspection of WebView"
-msgstr ""
+msgstr "Zezwalaj na badanie WebView"
 
 #: ../../src/client/geary-controller.vala:40
 msgid "Archive conversation (Delete, Backspace, A)"
@@ -351,7 +353,7 @@ msgstr "Kompozytor"
 
 #: ../../src/client/views/conversation-viewer.vala:539
 msgid "Copy _Email Address"
-msgstr "Skopiuj adres _email"
+msgstr "Skopiuj adres _e-mail"
 
 #: ../../src/client/views/conversation-viewer.vala:533
 msgid "Copy _Link"
@@ -523,7 +525,7 @@ msgstr "Wcina akapit"
 #. Indent text
 #: ../../ui/composer.glade:494
 msgid "Indent (Ctrl+])"
-msgstr ""
+msgstr "Zwiększ wcięcie (Ctrl+])"
 
 #: ../../ui/composer.glade:443
 msgid "Italic"
@@ -549,7 +551,7 @@ msgstr "Etykiety"
 
 #: ../../src/client/composer/composer-window.vala:354
 msgid "Large"
-msgstr "Ogromny"
+msgstr "Ogromna"
 
 #: ../../ui/composer.glade:61
 msgid "Lin_k"
@@ -641,7 +643,7 @@ msgstr "Ja"
 
 #: ../../src/client/composer/composer-window.vala:351
 msgid "Medium"
-msgstr "Średni"
+msgstr "Średnia"
 
 #: ../../ui/toolbar.glade:182
 msgid "Menu"
@@ -677,11 +679,11 @@ msgstr "Nowa wiadomość"
 
 #: ../../ui/remove_confirm.glade:83
 msgid "Nickname:"
-msgstr "Nick:"
+msgstr "Etykieta:"
 
 #: ../../ui/login.glade:664
 msgid "No authentication re_quired"
-msgstr ""
+msgstr "Brak _uwierzytelniania"
 
 #: ../../src/client/views/conversation-viewer.vala:158
 msgid "No conversations selected."
@@ -807,7 +809,7 @@ msgstr "Odpowiedz do ostatniej wiadomości w rozmowie (Ctrl+R, R)"
 
 #: ../../ui/composer.glade:147
 msgid "Rich Text"
-msgstr ""
+msgstr "Tekst sformatowany"
 
 #: ../../ui/password-dialog.glade:162
 msgid "SMTP Credentials"
@@ -911,7 +913,7 @@ msgstr "Rozpocznij nową rozmowę (Ctrl+N, N)"
 
 #: ../../ui/login.glade:764
 msgid "Storage"
-msgstr ""
+msgstr "Magazyn lokalny"
 
 #: ../../ui/composer.glade:471
 msgid "Strikethrough"
@@ -974,7 +976,7 @@ msgstr "Zmniejsza wcięcie akapitu"
 #. Removes an indent level
 #: ../../ui/composer.glade:508
 msgid "Un-indent (Ctrl+[)"
-msgstr ""
+msgstr "Zmniejsz wcięcie (Ctrl+[)"
 
 #: ../../src/client/dialogs/password-dialog.vala:17
 msgid "Unable to login to email server"
@@ -1083,7 +1085,7 @@ msgstr "_Wyświetlanie podglądu wiadomości"
 
 #: ../../ui/login.glade:785
 msgid "_Download mail:"
-msgstr "_Pobierz e-mail:"
+msgstr "_Pobierz wiadomości z ost.:"
 
 #: ../../ui/login.glade:117
 msgid "_Email address:"
@@ -1100,7 +1102,7 @@ msgstr "Pomo_c"
 
 #: ../../src/client/views/conversation-viewer.vala:552
 msgid "_Inspect"
-msgstr ""
+msgstr "Zbada_j"
 
 #: ../../ui/composer.glade:55
 msgid "_Justify"
diff --git a/po/tr.po b/po/tr.po
index 275ed682..29e1aea4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -19,7 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../../src/client/accounts/add-edit-page.vala:621
 msgid "        &#8226; Connection error.\n"
@@ -116,12 +116,14 @@ msgstr "%b %-e"
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d yeni mesaj"
+msgstr[1] "%d yeni mesaj"
 
 #: ../../src/client/folder-list/folder-list-folder-entry.vala:29
 #, c-format
 msgid "%d unread message"
 msgid_plural "%d unread messages"
 msgstr[0] ""
+msgstr[1] ""
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -824,6 +826,7 @@ msgstr "Sans Serif"
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "E_klentiyi kaydet..."
+msgstr[1] "E_klentiyi kaydet..."
 
 #: ../../src/client/views/conversation-viewer.vala:754
 msgid "Save All A_ttachments..."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b64b9088..3ea182d7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,16 +4,17 @@
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
+# hepin <hepin1989@gmail.com>, 2013.
+# hepin <hepin@sosia.us>, 2013.
 # Kuang Chen <kchenphy@gmail.com>, 2012.
 # tuhaihe <1132321739qq@gmail.com>, 2012.
-# hepin <hepin@sosia.us>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.3.0\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n"
 "POT-Creation-Date: 2013-02-26 16:16-0800\n"
-"PO-Revision-Date: 2013-02-27 00:48+0000\n"
-"Last-Translator: hepin <hepin@sosia.us>\n"
+"PO-Revision-Date: 2013-03-14 01:58+0000\n"
+"Last-Translator: hepin1989 <hepin1989@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -118,10 +119,10 @@ msgid_plural "%d new messages"
 msgstr[0] "%d 封新邮件"
 
 #: ../../src/client/folder-list/folder-list-folder-entry.vala:29
-#, fuzzy, c-format
+#, c-format
 msgid "%d unread message"
 msgid_plural "%d unread messages"
-msgstr[0] "%d 封未读"
+msgstr[0] "%d 封新邮件"
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
@@ -146,7 +147,7 @@ msgstr ""
 #: ../../src/client/views/conversation-web-view.vala:326
 #, c-format
 msgid "%s - Conversation Inspector"
-msgstr ""
+msgstr "会话检查 %s"
 
 #: ../../src/client/notification/libindicate.vala:59
 #: ../../src/client/notification/libmessagingmenu.vala:75
@@ -1020,7 +1021,7 @@ msgstr "关于(_A)"
 
 #: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
 msgid "_Add"
-msgstr ""
+msgstr "添加(_A)"
 
 #: ../../src/client/geary-controller.vala:39
 msgid "_Archive"