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

[Danielle Foré]

Change Geary to Mail

[kay van der Zander (kay20)]

Looks good. Perhaps change APP_ID into org.pantheon.mail?

review: Needs Information

[Danielle Foré (danrabbit)]

Changing the APP_ID requires moving the gsettings schemas. I'm not sure if we really want to do that yet. I think it's outside the scope of this branch, which is only an aesthetic change and not a technical one

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

1875. By Danielle Foré on 2015-11-23

geary is now mail

[kay van der Zander (kay20)]

Yes i agree

review: Approve

=== modified file 'data/geary-attach.contract.in'
--- data/geary-attach.contract.in	2014-10-10 21:51:05 +0000
+++ data/geary-attach.contract.in	2015-11-23 01:35:06 +0000
@@ -1,6 +1,6 @@
 [Contractor Entry]
-_Name=Send by email
+_Name=Send by Email
 Icon=mail-send
-_Description=Send files using Geary
+_Description=Send files using Mail
 MimeType=!inode;
 Exec=geary-attach %F

=== modified file 'data/geary.desktop.in'
--- data/geary.desktop.in	2015-11-19 13:04:51 +0000
+++ data/geary.desktop.in	2015-11-23 01:35:06 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Geary
-_GenericName=Mail Client
-_X-GNOME-FullName=Geary Mail
+_Name=Mail
+_GenericName=Mail
+_X-GNOME-FullName=Mail
 _Comment=Send and receive email
 _Keywords=Email;E-mail;Mail;
 Icon=internet-mail

=== modified file 'src/client/application/geary-application.vala'
--- src/client/application/geary-application.vala	2015-03-26 22:21:11 +0000
+++ src/client/application/geary-application.vala	2015-11-23 01:35:06 +0000
@@ -12,7 +12,7 @@
 extern const string GETTEXT_PACKAGE;
 
 public class GearyApplication : Gtk.Application {
-    public const string NAME = "Geary";
+    public const string NAME = "Mail";
     public const string PRGNAME = "geary";
     public const string APP_ID = "org.yorba.geary";
     public const string DESCRIPTION = _("Mail Client");