X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=po%2Fen_GB.po;h=ac15c6692d892128717c88f1e454fcbd442f68e9;hp=574bd500aa45463ed78abd64c518f75cdb257db8;hb=38454a69440197510b16c5a5444e19f234c91690;hpb=5661bfe0408f4b2753a2a91aa28826e62e5e590b

diff --git a/po/en_GB.po b/po/en_GB.po
index 574bd50..ac15c66 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -603,9 +603,7 @@ msgstr "Save to Drafts"
 #: ../src/widgets/modest-msg-edit-window-ui.h:64
 #: ../src/widgets/modest-header-window.c:917
 msgid "mcen_me_delete_messages"
-msgstr ""
-"Delete message?\n"
-"%s"
+msgstr "Delete message"
 
 #: ../src/widgets/modest-msg-edit-window-ui.h:66
 msgid "mcen_me_inbox_delete"
@@ -1019,7 +1017,7 @@ msgstr ""
 #: ../src/hildon2/modest-hildon2-global-settings-dialog.c:231
 #: ../src/hildon2/modest-hildon2-global-settings-dialog.c:238
 msgid "mcen_ti_default_account"
-msgstr "E-mail accounts"
+msgstr "Default account"
 
 #: ../src/hildon2/modest-hildon2-global-settings-dialog.c:254
 #: ../src/hildon2/modest-hildon2-global-settings-dialog.c:260
@@ -1028,11 +1026,11 @@ msgstr "Default message format"
 
 #: ../src/hildon2/modest-hildon2-global-settings-dialog.c:268
 msgid "mcen_fi_options_incoming_notifications"
-msgstr "Update when connected via"
+msgstr "Show incoming notifications"
 
 #: ../src/hildon2/modest-hildon2-global-settings-dialog.c:274
 msgid "mcen_fi_options_automatic_add"
-msgstr "Update automatically"
+msgstr "Add contacts automatically"
 
 #. Separator label
 #: ../src/hildon2/modest-hildon2-global-settings-dialog.c:279
@@ -1337,7 +1335,7 @@ msgstr ""
 #: ../src/widgets/modest-default-account-settings-dialog.c:759
 #: ../src/widgets/modest-easysetup-wizard-dialog.c:1181
 msgid "mcen_li_emailsetup_smtp"
-msgstr "Outgoing server (SMTP)"
+msgstr "Outgoing server"
 
 #. This causes a warning because of the %s in the translation, but not in the original string:
 #: ../src/widgets/modest-connection-specific-smtp-edit-window.c:574
@@ -1392,7 +1390,7 @@ msgstr "Signature"
 #: ../src/widgets/modest-default-account-settings-dialog.c:632
 #: ../src/widgets/modest-easysetup-wizard-dialog.c:901
 msgid "mcen_li_emailsetup_servertype"
-msgstr "Incoming server (%s)"
+msgstr "Incoming server"
 
 #: ../src/widgets/modest-default-account-settings-dialog.c:791
 #: ../src/widgets/modest-easysetup-wizard-dialog.c:1207
@@ -1568,13 +1566,11 @@ msgstr "Rename…"
 
 #: ../src/widgets/modest-folder-window.c:578
 msgid "mcen_me_move_folder"
-msgstr "Folder"
+msgstr "Move folder"
 
 #: ../src/widgets/modest-folder-window.c:581
 msgid "mcen_me_delete_folder"
-msgstr ""
-"Delete folder and its contents?\n"
-"%s"
+msgstr "Delete folder"
 
 #. Set title
 #: ../src/widgets/modest-global-settings-dialog.c:138
@@ -1732,7 +1728,7 @@ msgstr "Last 20 messages"
 #: ../src/widgets/modest-msg-edit-window.c:4297
 #: ../src/widgets/modest-msg-edit-window.c:4492
 msgid "mcen_me_message_settings"
-msgstr "Message sent"
+msgstr "Message settings…"
 
 #: ../src/widgets/modest-msg-edit-window.c:2345
 msgid "mcen_ia_select_inline_image_title"
@@ -1917,10 +1913,10 @@ msgstr "Select attachment"
 #~ msgid "emev_ib_ui_smtp_send_error"
 #~ msgstr "SMTP send operation failed. Please try again later."
 
-#~ msgid "emev_nc_delete_mailboximap"
-#~ msgstr ""
-#~ "Deleting this e-mail account will remove all local copies of messages "
-#~ "retrieved to this account's Inbox and IMAP folders. Delete anyway?"
+msgid "emev_nc_delete_mailboximap"
+msgstr ""
+"Deleting this e-mail account will remove all local copies of messages "
+"retrieved to this account's Inbox and IMAP folders. Delete anyway?"
 
 #~ msgid "emev_nc_mailbox_inuse"
 #~ msgstr "E-mail account in use"
@@ -2001,11 +1997,11 @@ msgstr "Select attachment"
 #~ msgid "mcen_fi_advsetup_limit_retrieve"
 #~ msgstr "Retrieval limit"
 
-#~ msgid "mcen_fi_advsetup_other_security_secureimap4s"
-#~ msgstr "SSL (IMAP4S)"
+msgid "mcen_fi_advsetup_other_security_secureimap4s"
+msgstr "SSL (IMAP4S)"
 
-#~ msgid "mcen_fi_advsetup_other_security_securepop3s"
-#~ msgstr "SSL (POP3S)"
+msgid "mcen_fi_advsetup_other_security_securepop3s"
+msgstr "SSL (POP3S)"
 
 #~ msgid "mcen_fi_advsetup_retrievetype"
 #~ msgstr "Retrieve"