Merge lp:~elementary-apps/pantheon-mail/no-geary-ui into lp:~elementary-apps/pantheon-mail/trunk

[Danielle Foré]

Replace instances of Geary in .ui files with Mail

[lp:~elementary-apps/pantheon-mail/no-geary-ui]

1949. By Ralph Plawetzki on 2016-01-29

replace instances of Geary with Mail

[Ralph Plawetzki (purejava)]

Looks good.

review: Approve

[Ralph Plawetzki (purejava)]

> Looks good.

Forget to say that I changed some more strings as discussed on slack before.

=== modified file 'data/ui/account_spinner.ui'
--- data/ui/account_spinner.ui	2015-12-14 17:36:36 +0000
+++ data/ui/account_spinner.ui	2016-01-29 06:24:26 +0000
@@ -38,7 +38,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Please wait while Geary validates your account.</property>
+        <property name="label" translatable="yes">Please wait while Mail validates your account.</property>
       </object>
       <packing>
         <property name="expand">False</property>
 
=== modified file 'data/ui/composer.ui'
--- data/ui/composer.ui	2015-12-14 17:36:36 +0000
+++ data/ui/composer.ui	2016-01-29 06:24:26 +0000
@@ -437,7 +437,7 @@
                   <object class="GtkLabel" id="from label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes" comments="Geary account mail will be sent from">From</property>
+                    <property name="label" translatable="yes" comments="Account mail will be sent from">From</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">to</property>
                     <property name="xalign">1</property>
 
=== modified file 'data/ui/upgrade_dialog.ui'
--- data/ui/upgrade_dialog.ui	2015-12-14 17:36:36 +0000
+++ data/ui/upgrade_dialog.ui	2016-01-29 06:24:26 +0000
@@ -57,7 +57,7 @@
               <object class="GtkLabel" id="text_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Geary update in progress…</property>
+                <property name="label" translatable="yes">Mail update in progress…</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
 
=== modified file 'src/client/accounts/add-edit-page.vala'
--- src/client/accounts/add-edit-page.vala	2015-12-14 17:46:52 +0000
+++ src/client/accounts/add-edit-page.vala	2016-01-29 06:24:26 +0000
@@ -768,7 +768,7 @@
                 error_string += _("        &#8226; Invalid account nickname.\n");
             
             if (last_validation_result.is_all_set(Geary.Engine.ValidationResult.EMAIL_EXISTS))
-                error_string += _("        &#8226; Email address already added to Geary.\n");
+                error_string += _("        &#8226; Email address already added to Mail.\n");
             
             if (get_service_provider() == Geary.ServiceProvider.OTHER) {
                 if (last_validation_result.is_all_set(Geary.Engine.ValidationResult.IMAP_CONNECTION_FAILED))
 
=== modified file 'src/client/application/geary-controller.vala'
--- src/client/application/geary-controller.vala	2016-01-28 17:48:53 +0000
+++ src/client/application/geary-controller.vala	2016-01-29 06:24:26 +0000
@@ -1049,12 +1049,12 @@
             switch (message) {
                 case StatusBar.Message.OUTBOX_SEND_FAILURE:
                     libnotify.set_error_notification(_("Error sending email"),
-                        _("Geary encountered an error sending an email.  If the problem persists, please manually delete the email from your Outbox folder."));
+                        _("Mail encountered an error sending an email.  If the problem persists, please manually delete the email from your Outbox folder."));
                 break;
 
                 case StatusBar.Message.OUTBOX_SAVE_SENT_MAIL_FAILED:
                     libnotify.set_error_notification(_("Error saving sent mail"),
-                        _("Geary encountered an error saving a sent message to Sent Mail.  The message will stay in your Outbox folder until you delete it."));
+                        _("Mail encountered an error saving a sent message to Sent Mail.  The message will stay in your Outbox folder until you delete it."));
                 break;
 
                 default:
@@ -1136,7 +1136,7 @@
         // have provisions for that.
         AlertDialog dialog = new QuestionDialog(main_window,
             _("Unable to open the database for %s").printf(account.information.email),
-            _("There was an error opening the local mail database for this account. This is possibly due to corruption of the database file in this directory:\n\n%s\n\nGeary can rebuild the database and re-synchronize with the server or exit.\n\nRebuilding the database will destroy all local email and its attachments. <b>The mail on the your server will not be affected.</b>")
+            _("There was an error opening the local mail database for this account. This is possibly due to corruption of the database file in this directory:\n\n%s\n\nMail can rebuild the database and re-synchronize with the server or exit.\n\nRebuilding the database will destroy all local email and its attachments. <b>The mail on the your server will not be affected.</b>")
                 .printf(account.information.settings_dir.get_path()),
             _("_Rebuild"), _("E_xit"));
         dialog.use_secondary_markup(true);
@@ -1181,7 +1181,7 @@
     private async void account_database_version_async(Geary.Account account) {
         ErrorDialog dialog = new ErrorDialog(main_window,
             _("Unable to open local mailbox for %s").printf(account.information.email),
-            _("The version number of the local mail database is formatted for a newer version of Geary. Unfortunately, the database cannot be \"rolled back\" to work with this version of Geary.\n\nPlease install the latest version of Geary and try again."));
+            _("The version number of the local mail database is formatted for a newer version of Mail. Unfortunately, the database cannot be \"rolled back\" to work with this version of Mail.\n\nPlease install the latest version of Mail and try again."));
         dialog.run();
 
         GearyApplication.instance.exit(1);
@@ -1192,7 +1192,7 @@
         // Geary today with an account in unopened state, so have to exit
         ErrorDialog dialog = new ErrorDialog(main_window,
             _("Unable to open local mailbox for %s").printf(account.information.email),
-            _("There was an error opening the local account. This is probably due to connectivity issues.\n\nPlease check your network connection and restart Geary."));
+            _("There was an error opening the local account. This is probably due to connectivity issues.\n\nPlease check your network connection and restart Mail."));
         dialog.run();
 
         GearyApplication.instance.exit(1);
@@ -2399,7 +2399,7 @@
 
         ConfirmationDialog dialog = new ConfirmationDialog(main_window,
             _("Empty all email from your %s folder?").printf(special_folder_type.get_display_name()),
-            _("This removes the email from Geary and your email server.")
+            _("This removes the email from Mail and your email server.")
                 + "  <b>" + _("This cannot be undone.") + "</b>",
             _("Empty %s").printf(special_folder_type.get_display_name()));
         dialog.use_secondary_markup(true);
 
=== modified file 'src/client/dialogs/certificate-warning-dialog.vala'
--- src/client/dialogs/certificate-warning-dialog.vala	2015-12-14 17:46:52 +0000
+++ src/client/dialogs/certificate-warning-dialog.vala	2016-01-29 06:24:26 +0000
@@ -49,16 +49,16 @@
             // could be a new or existing account
             dont_trust_label.label =
                 "<b>"
-                + _("Selecting \"Don't Trust This Server\" will cause Geary not to access this server.")
+                + _("Selecting \"Don't Trust This Server\" will cause Mail not to access this server.")
                 + "</b> "
-                + _("Geary will not add or update this email account.");
+                + _("Mail will not add or update this email account.");
         } else {
             // a registered account
             dont_trust_label.label =
                 "<b>"
-                + _("Selecting \"Don't Trust This Server\" will cause Geary to stop accessing this account.")
+                + _("Selecting \"Don't Trust This Server\" will cause Mail to stop accessing this account.")
                 + "</b> "
-                + _("Geary will exit if you have no other open email accounts.");
+                + _("Mail will exit if you have no other open email accounts.");
         }
         dont_trust_label.use_markup = true;
         
 
=== modified file 'src/client/dialogs/password-dialog.vala'
--- src/client/dialogs/password-dialog.vala	2015-12-14 17:46:52 +0000
+++ src/client/dialogs/password-dialog.vala	2016-01-29 06:24:26 +0000
@@ -13,7 +13,7 @@
     // strings, and Glade doesn't support the "larger" size attribute. See this bug report for
     // details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
     private const string PRIMARY_TEXT_MARKUP = "<span weight=\"bold\" size=\"larger\">%s</span>";
-    private const string PRIMARY_TEXT_FIRST_TRY = _("Geary requires your email password to continue");
+    private const string PRIMARY_TEXT_FIRST_TRY = _("Mail requires your email password to continue");
     
     private Gtk.Dialog dialog;
     private Gtk.Entry entry_password;