Merge lp:~leonardolemos/pantheon-mail/make-ui-translatable into lp:~elementary-apps/pantheon-mail/trunk

[Leonardo Lemos]

Change .glade files to .ui allowing them to be translated.

[RabbitBot (rabbitbot-a)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'data/ui/CMakeLists.txt'
--- data/ui/CMakeLists.txt	2015-12-01 19:36:39 +0000
+++ data/ui/CMakeLists.txt	2015-12-15 13:33:03 +0000
@@ -1,19 +1,19 @@
 set(UI_DEST share/geary/ui)
 
 install(FILES accelerators.ui DESTINATION ${UI_DEST})
-install(FILES account_list.glade DESTINATION ${UI_DEST})
-install(FILES account_cannot_remove.glade DESTINATION ${UI_DEST})
-install(FILES account_spinner.glade DESTINATION ${UI_DEST})
+install(FILES account_list.ui DESTINATION ${UI_DEST})
+install(FILES account_cannot_remove.ui DESTINATION ${UI_DEST})
+install(FILES account_spinner.ui DESTINATION ${UI_DEST})
 install(FILES app_menu.interface DESTINATION ${UI_DEST})
-install(FILES certificate_warning_dialog.glade DESTINATION ${UI_DEST})
-install(FILES composer.glade DESTINATION ${UI_DEST})
+install(FILES certificate_warning_dialog.ui DESTINATION ${UI_DEST})
+install(FILES composer.ui DESTINATION ${UI_DEST})
 install(FILES composer_accelerators.ui DESTINATION ${UI_DEST})
-install(FILES edit_alternate_emails.glade DESTINATION ${UI_DEST})
-install(FILES find_bar.glade DESTINATION ${UI_DEST})
-install(FILES login.glade DESTINATION ${UI_DEST})
-install(FILES message.glade DESTINATION ${UI_DEST})
-install(FILES password-dialog.glade DESTINATION ${UI_DEST})
-install(FILES remove_confirm.glade DESTINATION ${UI_DEST})
+install(FILES edit_alternate_emails.ui DESTINATION ${UI_DEST})
+install(FILES find_bar.ui DESTINATION ${UI_DEST})
+install(FILES login.ui DESTINATION ${UI_DEST})
+install(FILES message.ui DESTINATION ${UI_DEST})
+install(FILES password-dialog.ui DESTINATION ${UI_DEST})
+install(FILES remove_confirm.ui DESTINATION ${UI_DEST})
 install(FILES toolbar_empty_menu.ui DESTINATION ${UI_DEST})
 install(FILES toolbar_mark_menu.ui DESTINATION ${UI_DEST})
-install(FILES upgrade_dialog.glade DESTINATION ${UI_DEST})
+install(FILES upgrade_dialog.ui DESTINATION ${UI_DEST})

=== renamed file 'data/ui/account_cannot_remove.glade' => 'data/ui/account_cannot_remove.ui'
=== renamed file 'data/ui/account_list.glade' => 'data/ui/account_list.ui'
=== renamed file 'data/ui/account_spinner.glade' => 'data/ui/account_spinner.ui'
=== renamed file 'data/ui/certificate_warning_dialog.glade' => 'data/ui/certificate_warning_dialog.ui'
=== renamed file 'data/ui/composer.glade' => 'data/ui/composer.ui'
=== renamed file 'data/ui/edit_alternate_emails.glade' => 'data/ui/edit_alternate_emails.ui'
=== renamed file 'data/ui/find_bar.glade' => 'data/ui/find_bar.ui'
=== renamed file 'data/ui/login.glade' => 'data/ui/login.ui'
=== renamed file 'data/ui/message.glade' => 'data/ui/message.ui'
=== renamed file 'data/ui/password-dialog.glade' => 'data/ui/password-dialog.ui'
=== renamed file 'data/ui/remove_confirm.glade' => 'data/ui/remove_confirm.ui'
=== renamed file 'data/ui/upgrade_dialog.glade' => 'data/ui/upgrade_dialog.ui'
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-11-20 20:12:38 +0000
+++ po/CMakeLists.txt	2015-12-15 13:33:03 +0000
@@ -2,4 +2,5 @@
 add_translations_directory(${GETTEXT_PACKAGE})
 add_translations_catalog(${GETTEXT_PACKAGE}
     ../src
+    ../data
 )

=== modified file 'po/geary.pot'
--- po/geary.pot	2015-11-30 17:51:54 +0000
+++ po/geary.pot	2015-12-15 13:33:03 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 11:51-0600\n"
+"POT-Creation-Date: 2015-12-14 14:34-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -87,7 +87,8 @@
 msgid "Archive"
 msgstr ""
 
-#: ../src/engine/api/geary-special-folder-type.vala:58
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../data/ui/login.ui:633
+#: ../data/ui/login.ui:650
 msgid "None"
 msgstr ""
 
@@ -910,90 +911,112 @@
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:233
+#: ../src/client/accounts/add-edit-page.vala:234
 msgid "Enter your account information to get started."
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:253
+#: ../src/client/accounts/add-edit-page.vala:254
 msgid "2 weeks back"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:254
+#: ../src/client/accounts/add-edit-page.vala:255
 msgid "1 month back"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:255
+#: ../src/client/accounts/add-edit-page.vala:256
 msgid "3 months back"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:256
+#: ../src/client/accounts/add-edit-page.vala:257
 msgid "6 months back"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:257
+#: ../src/client/accounts/add-edit-page.vala:258
 msgid "1 year back"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:258
+#: ../src/client/accounts/add-edit-page.vala:259
 msgid "2 years back"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:259
+#: ../src/client/accounts/add-edit-page.vala:260
 msgid "4 years back"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:261
+#: ../src/client/accounts/add-edit-page.vala:262
 msgid "Everything"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:280
+#: ../src/client/accounts/add-edit-page.vala:281
 msgid "Edit"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:282
+#: ../src/client/accounts/add-edit-page.vala:283
 msgid "Preview"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:723
+#: ../src/client/accounts/add-edit-page.vala:725
 msgid "Remem_ber passwords"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:730
+#: ../src/client/accounts/add-edit-page.vala:732 ../data/ui/login.ui:62
 msgid "Remem_ber password"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:764
+#: ../src/client/accounts/add-edit-page.vala:766
 msgid "Unable to validate:\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:766
+#: ../src/client/accounts/add-edit-page.vala:768
 msgid "        &#8226; Invalid account nickname.\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:769
+#: ../src/client/accounts/add-edit-page.vala:771
 msgid "        &#8226; Email address already added to Geary.\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:773
+#: ../src/client/accounts/add-edit-page.vala:775
 msgid "        &#8226; IMAP connection error.\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:776
+#: ../src/client/accounts/add-edit-page.vala:778
 msgid "        &#8226; IMAP username or password incorrect.\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:779
+#: ../src/client/accounts/add-edit-page.vala:781
 msgid "        &#8226; SMTP connection error.\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:782
+#: ../src/client/accounts/add-edit-page.vala:784
 msgid "        &#8226; SMTP username or password incorrect.\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:786
+#: ../src/client/accounts/add-edit-page.vala:788
 msgid "        &#8226; Connection error.\n"
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:790
+#: ../src/client/accounts/add-edit-page.vala:792
 msgid "        &#8226; Username or password incorrect.\n"
 msgstr ""
 
@@ -1212,6 +1235,7 @@
 msgstr ""
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+#: ../data/ui/composer.ui:29
 msgid "_Copy"
 msgstr ""
 
@@ -1220,6 +1244,7 @@
 msgstr ""
 
 #: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+#: ../data/ui/composer.ui:106
 msgid "Copy _Link"
 msgstr ""
 
@@ -1425,14 +1450,17 @@
 msgstr ""
 
 #: ../src/client/components/stock.vala:18
+#: ../data/ui/account_cannot_remove.ui:74
 msgid "_OK"
 msgstr ""
 
-#: ../src/client/components/stock.vala:19
+#: ../src/client/components/stock.vala:19 ../data/ui/remove_confirm.ui:153
+#: ../data/ui/edit_alternate_emails.ui:160 ../data/ui/password-dialog.ui:196
 msgid "_Cancel"
 msgstr ""
 
 #: ../src/client/components/stock.vala:23
+#: ../src/client/dialogs/preferences-dialog.vala:84
 msgid "_Close"
 msgstr ""
 
@@ -1448,7 +1476,7 @@
 msgid "_Print..."
 msgstr ""
 
-#: ../src/client/components/stock.vala:30
+#: ../src/client/components/stock.vala:30 ../data/ui/remove_confirm.ui:168
 msgid "_Remove"
 msgstr ""
 
@@ -1469,6 +1497,7 @@
 #: ../src/client/components/main-toolbar.vala:144
 #: ../src/client/composer/composer-headerbar.vala:90
 #: ../src/client/components/main-toolbar.vala:162
+#: ../src/client/composer/composer-headerbar.vala:75
 msgid "Menu"
 msgstr ""
 
@@ -1481,13 +1510,535 @@
 msgstr ""
 
 #: ../src/client/accounts/add-edit-page.vala:233
+#: ../src/client/accounts/add-edit-page.vala:234
 msgid "Welcome to Mail"
 msgstr ""
 
-#: ../src/client/composer/composer-toolbar.vala:43
+#: ../src/client/composer/composer-toolbar.vala:43 ../data/ui/composer.ui:75
 msgid "More options"
 msgstr ""
 
 #: ../src/client/components/main-toolbar.vala:312
 msgid "Search %s"
 msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:23
+msgid "Reading"
+msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:28
+msgid "Automatically select next message:"
+msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:33
+msgid "Conversation previews:"
+msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:38
+msgid "Three-pane layout:"
+msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:42 ../data/ui/login.ui:853
+msgid "Composer"
+msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:47
+msgid "Spell check:"
+msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:51
+msgid "Notifications"
+msgstr ""
+
+#: ../src/client/dialogs/preferences-dialog.vala:56
+msgid "Always watch for new mail:"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete Conversation (Shift+Delete)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete Conversations (Shift+Delete)"
+msgstr ""
+
+#: ../data/ui/remove_confirm.ui:43
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+"account?</span> "
+msgstr ""
+
+#: ../data/ui/remove_confirm.ui:58
+msgid ""
+"All email associated with this account will be removed from your computer. "
+"This will not affect email on the server."
+msgstr ""
+
+#: ../data/ui/remove_confirm.ui:80
+msgid "Nickname:"
+msgstr ""
+
+#: ../data/ui/remove_confirm.ui:94
+msgid "Email address:"
+msgstr ""
+
+#: ../data/ui/find_bar.ui:59
+msgid "Find"
+msgstr ""
+
+#: ../data/ui/find_bar.ui:72
+msgid "Previous Result"
+msgstr ""
+
+#: ../data/ui/find_bar.ui:91
+msgid "Next result"
+msgstr ""
+
+#: ../data/ui/find_bar.ui:107
+msgid "_Case sensitive"
+msgstr ""
+
+#: ../data/ui/find_bar.ui:127
+msgid "label"
+msgstr ""
+
+#: ../data/ui/upgrade_dialog.ui:60
+msgid "Geary update in progress…"
+msgstr ""
+
+#: ../data/ui/edit_alternate_emails.ui:112
+msgid "Remove email address"
+msgstr ""
+
+#: ../data/ui/edit_alternate_emails.ui:136
+msgid ""
+"Some email services require additional addresses be configured on the "
+"server.  Contact your email provider for more information."
+msgstr ""
+
+#: ../data/ui/edit_alternate_emails.ui:175
+msgid "_Update"
+msgstr ""
+
+#: ../data/ui/account_spinner.ui:41
+msgid "Please wait while Geary validates your account."
+msgstr ""
+
+#: ../data/ui/composer.ui:8
+msgid "_Undo"
+msgstr ""
+
+#: ../data/ui/composer.ui:15
+msgid "_Redo"
+msgstr ""
+
+#: ../data/ui/composer.ui:22
+msgid "Cu_t"
+msgstr ""
+
+#: ../data/ui/composer.ui:36
+msgid "_Paste"
+msgstr ""
+
+#: ../data/ui/composer.ui:43
+msgid "_Left"
+msgstr ""
+
+#: ../data/ui/composer.ui:48
+msgid "_Right"
+msgstr ""
+
+#: ../data/ui/composer.ui:53
+msgid "_Center"
+msgstr ""
+
+#: ../data/ui/composer.ui:58
+msgid "_Justify"
+msgstr ""
+
+#: ../data/ui/composer.ui:63
+msgid "Link (Ctrl+L)"
+msgstr ""
+
+#: ../data/ui/composer.ui:70
+msgid "C_olor"
+msgstr ""
+
+#: ../data/ui/composer.ui:81
+msgid "Quote text  (Ctrl+])"
+msgstr ""
+
+#: ../data/ui/composer.ui:87
+msgid "Unquote text (Ctrl+[)"
+msgstr ""
+
+#: ../data/ui/composer.ui:93
+msgid "Remove formatting (Ctrl+Space)"
+msgstr ""
+
+#: ../data/ui/composer.ui:100
+msgctxt "Clipboard paste with rich text"
+msgid "Paste _With Formatting"
+msgstr ""
+
+#: ../data/ui/composer.ui:111
+msgid "Bold (Ctrl+B)"
+msgstr ""
+
+#: ../data/ui/composer.ui:118
+msgid "Italic (Ctrl+I)"
+msgstr ""
+
+#: ../data/ui/composer.ui:125
+msgid "Underline (Ctrl+U)"
+msgstr ""
+
+#: ../data/ui/composer.ui:132
+msgid "Strikethrough (Ctrl+K)"
+msgstr ""
+
+#: ../data/ui/composer.ui:139
+msgid "_Rich Text"
+msgstr ""
+
+#: ../data/ui/composer.ui:145
+msgid "Show Extended Fields"
+msgstr ""
+
+#: ../data/ui/composer.ui:157
+msgctxt "Label"
+msgid "Close and Save"
+msgstr ""
+
+#: ../data/ui/composer.ui:158
+msgctxt "Short Label"
+msgid "Close and Save"
+msgstr ""
+
+#: ../data/ui/composer.ui:159
+msgctxt "Tooltip"
+msgid "Close and Save"
+msgstr ""
+
+#: ../data/ui/composer.ui:165
+msgctxt "Label"
+msgid "Close and Discard"
+msgstr ""
+
+#: ../data/ui/composer.ui:166
+msgctxt "Short Label"
+msgid "Close and Discard"
+msgstr ""
+
+#: ../data/ui/composer.ui:167
+msgctxt "Tooltip"
+msgid "Close and Discard"
+msgstr ""
+
+#: ../data/ui/composer.ui:173
+msgid "Lar_ge"
+msgstr ""
+
+#: ../data/ui/composer.ui:174
+msgid "Large"
+msgstr ""
+
+#: ../data/ui/composer.ui:179
+msgid "_Medium"
+msgstr ""
+
+#: ../data/ui/composer.ui:180
+msgid "Medium"
+msgstr ""
+
+#: ../data/ui/composer.ui:185
+msgid "_Small"
+msgstr ""
+
+#: ../data/ui/composer.ui:186
+msgid "Small"
+msgstr ""
+
+#: ../data/ui/composer.ui:191
+msgid "S_ans Serif"
+msgstr ""
+
+#: ../data/ui/composer.ui:192
+msgid "Sans Serif"
+msgstr ""
+
+#: ../data/ui/composer.ui:197
+msgid "S_erif"
+msgstr ""
+
+#: ../data/ui/composer.ui:198
+msgid "Serif"
+msgstr ""
+
+#: ../data/ui/composer.ui:203
+msgid "_Fixed Width"
+msgstr ""
+
+#: ../data/ui/composer.ui:204
+msgid "Fixed Width"
+msgstr ""
+
+#: ../data/ui/composer.ui:209 ../data/ui/composer.ui:210
+msgid "Detach"
+msgstr ""
+
+#: ../data/ui/composer.ui:211
+msgid "Detach (Ctrl+D)"
+msgstr ""
+
+#: ../data/ui/composer.ui:218
+msgid "_Send"
+msgstr ""
+
+#: ../data/ui/composer.ui:219
+msgid "Send"
+msgstr ""
+
+#: ../data/ui/composer.ui:220
+msgid "Send (Ctrl+Enter)"
+msgstr ""
+
+#: ../data/ui/composer.ui:226
+msgid "_Attach File"
+msgstr ""
+
+#: ../data/ui/composer.ui:227 ../data/ui/composer.ui:228
+msgid "Attach File"
+msgstr ""
+
+#: ../data/ui/composer.ui:234
+msgid "_Include Original Attachments"
+msgstr ""
+
+#: ../data/ui/composer.ui:235 ../data/ui/composer.ui:236
+msgid "Include Original Attachments"
+msgstr ""
+
+#: ../data/ui/composer.ui:242
+msgid "Application Menu"
+msgstr ""
+
+#. Address(es) e-mail is to be sent to
+#: ../data/ui/composer.ui:289
+msgid "_To"
+msgstr ""
+
+#: ../data/ui/composer.ui:308
+msgid "_Cc"
+msgstr ""
+
+#: ../data/ui/composer.ui:362
+msgid "_Subject"
+msgstr ""
+
+#: ../data/ui/composer.ui:381
+msgid "_Bcc"
+msgstr ""
+
+#: ../data/ui/composer.ui:411
+msgid "_Reply-To"
+msgstr ""
+
+#. Geary account mail will be sent from
+#: ../data/ui/composer.ui:440
+msgid "From"
+msgstr ""
+
+#: ../data/ui/composer.ui:519
+msgid "Drop files here"
+msgstr ""
+
+#: ../data/ui/composer.ui:535
+msgid "To add them as attachments"
+msgstr ""
+
+#: ../data/ui/account_cannot_remove.ui:40
+msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+msgstr ""
+
+#: ../data/ui/account_cannot_remove.ui:56
+msgid ""
+"A composer window associated with this account is currently open. Send or "
+"discard the message and try again."
+msgstr ""
+
+#: ../data/ui/login.ui:34
+msgid "Addi_tional email addresses…"
+msgstr ""
+
+#: ../data/ui/login.ui:46
+msgid "_Save sent mail"
+msgstr ""
+
+#: ../data/ui/login.ui:86 ../data/ui/password-dialog.ui:108
+msgid "Password"
+msgstr ""
+
+#: ../data/ui/login.ui:97 ../data/ui/login.ui:545
+msgid "_Password:"
+msgstr ""
+
+#: ../data/ui/login.ui:130
+msgid "E_mail address:"
+msgstr ""
+
+#: ../data/ui/login.ui:152
+msgid "Work, Home, etc."
+msgstr ""
+
+#: ../data/ui/login.ui:163
+msgid "N_ickname:"
+msgstr ""
+
+#: ../data/ui/login.ui:195
+msgid "N_ame:"
+msgstr ""
+
+#: ../data/ui/login.ui:211
+msgid "S_ervice:"
+msgstr ""
+
+#: ../data/ui/login.ui:298
+msgid "IMAP settings"
+msgstr ""
+
+#: ../data/ui/login.ui:315
+msgid "Se_rver:"
+msgstr ""
+
+#: ../data/ui/login.ui:347
+msgid "P_ort"
+msgstr ""
+
+#: ../data/ui/login.ui:409
+msgid "Ser_ver:"
+msgstr ""
+
+#: ../data/ui/login.ui:427
+msgid "Por_t"
+msgstr ""
+
+#: ../data/ui/login.ui:446
+msgid "SMTP settings"
+msgstr ""
+
+#: ../data/ui/login.ui:462
+msgid "User_name:"
+msgstr ""
+
+#: ../data/ui/login.ui:480
+msgid "Pass_word:"
+msgstr ""
+
+#: ../data/ui/login.ui:499
+msgid "SMTP username"
+msgstr ""
+
+#: ../data/ui/login.ui:514
+msgid "SMTP password"
+msgstr ""
+
+#: ../data/ui/login.ui:527
+msgid "_Username:"
+msgstr ""
+
+#: ../data/ui/login.ui:564
+msgid "IMAP username"
+msgstr ""
+
+#: ../data/ui/login.ui:579
+msgid "IMAP password"
+msgstr ""
+
+#: ../data/ui/login.ui:593
+msgid "Encr_yption:"
+msgstr ""
+
+#: ../data/ui/login.ui:613
+msgid "Encrypt_ion:"
+msgstr ""
+
+#: ../data/ui/login.ui:634 ../data/ui/login.ui:651
+msgid "SSL/TLS"
+msgstr ""
+
+#: ../data/ui/login.ui:635 ../data/ui/login.ui:652
+msgid "STARTTLS"
+msgstr ""
+
+#: ../data/ui/login.ui:663
+msgid "No authentication re_quired"
+msgstr ""
+
+#: ../data/ui/login.ui:679
+msgid "Use IMAP cre_dentials"
+msgstr ""
+
+#: ../data/ui/login.ui:783
+msgid "Storage"
+msgstr ""
+
+#: ../data/ui/login.ui:804
+msgid "_Download mail"
+msgstr ""
+
+#: ../data/ui/login.ui:867
+msgid "Save dra_fts on server"
+msgstr ""
+
+#: ../data/ui/login.ui:884
+msgid "Si_gn emails (HTML allowed):"
+msgstr ""
+
+#: ../data/ui/account_list.ui:69
+msgid "Add account"
+msgstr ""
+
+#: ../data/ui/account_list.ui:82
+msgid "Edit account"
+msgstr ""
+
+#: ../data/ui/account_list.ui:95
+msgid "Remove account"
+msgstr ""
+
+#: ../data/ui/certificate_warning_dialog.ui:7
+msgid "Untrusted Connection"
+msgstr ""
+
+#: ../data/ui/certificate_warning_dialog.ui:29
+msgid "_Always Trust This Server"
+msgstr ""
+
+#: ../data/ui/certificate_warning_dialog.ui:43
+msgid "_Trust This Server"
+msgstr ""
+
+#: ../data/ui/certificate_warning_dialog.ui:57
+msgid "_Don't Trust This Server"
+msgstr ""
+
+#: ../data/ui/password-dialog.ui:74
+msgid "SMTP Credentials"
+msgstr ""
+
+#: ../data/ui/password-dialog.ui:91
+msgid "Username"
+msgstr ""
+
+#: ../data/ui/password-dialog.ui:152
+msgid "_Remember password"
+msgstr ""
+
+#: ../data/ui/password-dialog.ui:210
+msgid "_Authenticate"
+msgstr ""

=== modified file 'src/client/accounts/account-dialog-account-list-pane.vala'
--- src/client/accounts/account-dialog-account-list-pane.vala	2015-02-06 20:43:33 +0000
+++ src/client/accounts/account-dialog-account-list-pane.vala	2015-12-15 13:33:03 +0000
@@ -24,7 +24,7 @@
     
     public AccountDialogAccountListPane(Gtk.Stack stack) {
         base(stack);
-        Gtk.Builder builder = GearyApplication.instance.create_builder("account_list.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("account_list.ui");
         pack_end((Gtk.Box) builder.get_object("container"));
         Gtk.ActionGroup actions = (Gtk.ActionGroup) builder.get_object("account list actions");
         edit_action = actions.get_action("edit_account");

=== modified file 'src/client/accounts/account-dialog-remove-confirm-pane.vala'
--- src/client/accounts/account-dialog-remove-confirm-pane.vala	2015-02-06 20:43:33 +0000
+++ src/client/accounts/account-dialog-remove-confirm-pane.vala	2015-12-15 13:33:03 +0000
@@ -17,7 +17,7 @@
     public AccountDialogRemoveConfirmPane(Gtk.Stack stack) {
         base(stack);
         
-        Gtk.Builder builder = GearyApplication.instance.create_builder("remove_confirm.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("remove_confirm.ui");
         pack_end((Gtk.Box) builder.get_object("container"));
         Gtk.ActionGroup actions = (Gtk.ActionGroup) builder.get_object("actions");
         account_nickname_label = (Gtk.Label) builder.get_object("account_nickname_label");

=== modified file 'src/client/accounts/account-dialog-remove-fail-pane.vala'
--- src/client/accounts/account-dialog-remove-fail-pane.vala	2015-02-06 20:43:33 +0000
+++ src/client/accounts/account-dialog-remove-fail-pane.vala	2015-12-15 13:33:03 +0000
@@ -11,7 +11,7 @@
     public AccountDialogRemoveFailPane(Gtk.Stack stack) {
         base(stack);
         
-        Gtk.Builder builder = GearyApplication.instance.create_builder("account_cannot_remove.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("account_cannot_remove.ui");
         pack_end((Gtk.Box) builder.get_object("container"));
         Gtk.ActionGroup actions = (Gtk.ActionGroup) builder.get_object("actions");
         actions.get_action("ok_action").activate.connect(() => { ok(); });

=== modified file 'src/client/accounts/account-spinner-page.vala'
--- src/client/accounts/account-spinner-page.vala	2015-02-06 20:43:33 +0000
+++ src/client/accounts/account-spinner-page.vala	2015-12-15 13:33:03 +0000
@@ -9,7 +9,7 @@
     public AccountSpinnerPage() {
         Object(orientation: Gtk.Orientation.VERTICAL, spacing: 4);
         
-        Gtk.Builder builder = GearyApplication.instance.create_builder("account_spinner.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("account_spinner.ui");
         pack_end((Gtk.Box) builder.get_object("container"));
     }
 }

=== modified file 'src/client/accounts/add-edit-page.vala'
--- src/client/accounts/add-edit-page.vala	2015-11-30 18:02:37 +0000
+++ src/client/accounts/add-edit-page.vala	2015-12-15 13:33:03 +0000
@@ -222,7 +222,7 @@
     public AddEditPage() {
         Object(orientation: Gtk.Orientation.VERTICAL, spacing: 4);
         
-        Gtk.Builder builder = GearyApplication.instance.create_builder("login.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("login.ui");
         
         // Primary container.
         container_widget = (Gtk.Widget) builder.get_object("container");

=== modified file 'src/client/components/conversation-find-bar.vala'
--- src/client/components/conversation-find-bar.vala	2015-02-06 20:43:33 +0000
+++ src/client/components/conversation-find-bar.vala	2015-12-15 13:33:03 +0000
@@ -36,7 +36,7 @@
     public ConversationFindBar(ConversationWebView web_view) {
         this.web_view = web_view;
         
-        builder = GearyApplication.instance.create_builder("find_bar.glade");
+        builder = GearyApplication.instance.create_builder("find_bar.ui");
         
         key_press_event.connect(on_key_press);
         button_press_event.connect(on_button_press);

=== modified file 'src/client/composer/composer-widget.vala'
--- src/client/composer/composer-widget.vala	2015-03-20 22:50:31 +0000
+++ src/client/composer/composer-widget.vala	2015-12-15 13:33:03 +0000
@@ -292,7 +292,7 @@
         setup_drag_destination(this);
         
         add_events(Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK);
-        builder = GearyApplication.instance.create_builder("composer.glade");
+        builder = GearyApplication.instance.create_builder("composer.ui");
         
         Gtk.Box box = builder.get_object("composer") as Gtk.Box;
         attachments_box = builder.get_object("attachments_box") as Gtk.Box;

=== modified file 'src/client/dialogs/certificate-warning-dialog.vala'
--- src/client/dialogs/certificate-warning-dialog.vala	2015-02-06 20:43:33 +0000
+++ src/client/dialogs/certificate-warning-dialog.vala	2015-12-15 13:33:03 +0000
@@ -17,7 +17,7 @@
     
     public CertificateWarningDialog(Gtk.Window? parent, Geary.AccountInformation account_information,
         Geary.Service service, TlsCertificateFlags warnings, bool is_validation) {
-        Gtk.Builder builder = GearyApplication.instance.create_builder("certificate_warning_dialog.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("certificate_warning_dialog.ui");
         
         dialog = (Gtk.Dialog) builder.get_object("CertificateWarningDialog");
         dialog.transient_for = parent;

=== modified file 'src/client/dialogs/password-dialog.vala'
--- src/client/dialogs/password-dialog.vala	2015-02-06 20:43:33 +0000
+++ src/client/dialogs/password-dialog.vala	2015-12-15 13:33:03 +0000
@@ -25,7 +25,7 @@
     
     public PasswordDialog(Gtk.Window? parent, bool smtp, Geary.AccountInformation account_information,
         Geary.ServiceFlag password_flags) {
-        Gtk.Builder builder = GearyApplication.instance.create_builder("password-dialog.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("password-dialog.ui");
         
         dialog = (Gtk.Dialog) builder.get_object("PasswordDialog");
         dialog.transient_for = parent;

=== modified file 'src/client/dialogs/upgrade-dialog.vala'
--- src/client/dialogs/upgrade-dialog.vala	2015-02-06 20:43:33 +0000
+++ src/client/dialogs/upgrade-dialog.vala	2015-12-15 13:33:03 +0000
@@ -22,7 +22,7 @@
      */
     public UpgradeDialog() {
         // Load UI.
-        Gtk.Builder builder = GearyApplication.instance.create_builder("upgrade_dialog.glade");
+        Gtk.Builder builder = GearyApplication.instance.create_builder("upgrade_dialog.ui");
         dialog = (Gtk.Dialog) builder.get_object("dialog");
         
         // Hook up signals.