Mail

Merge lp:~leonardolemos/pantheon-mail/change-actions into lp:~elementary-apps/pantheon-mail/trunk

  1. change-actions
  2. Merge into trunk
Proposed by Leonardo Lemos
Status: Merged
Approved by: Danielle Foré
Approved revision: 2069
Merged at revision: 2068
Proposed branch: lp:~leonardolemos/pantheon-mail/change-actions
Merge into: lp:~elementary-apps/pantheon-mail/trunk
Diff against target: 140 lines (+20/-12)
3 files modified
data/pantheon-mail.desktop.in.in (+5/-6)
po/extra/extra.pot (+4/-4)
po/pantheon-mail.pot (+11/-2)
To merge this branch: bzr merge lp:~leonardolemos/pantheon-mail/change-actions
Reviewer Review Type Date Requested Status
Danielle Foré Needs Fixing
Review via email: mp+296270@code.launchpad.net

Commit message

change the order of the .desktop file actions for better consistency between apps

Description of the change

This branch changes the order of the .desktop file actions for better consistency between apps.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

see diff comment

review: Needs Fixing
lp:~leonardolemos/pantheon-mail/change-actions updated
2069. By Leonardo Lemos

Fix actions order

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/pantheon-mail.desktop.in.in'
2--- data/pantheon-mail.desktop.in.in 2016-05-15 14:09:19 +0000
3+++ data/pantheon-mail.desktop.in.in 2016-06-03 00:34:15 +0000
4@@ -12,13 +12,12 @@
5 Categories=GNOME;GTK;Network;Email;
6 X-GNOME-Gettext-Domain=@GETTEXT_PACKAGE@
7 X-GNOME-UsesNotifications=true
8-Actions=AboutDialog;Compose;
9+Actions=Compose;AboutDialog;
10+
11+[Desktop Action Compose]
12+_Name=Compose Message
13+Exec=@EXEC_NAME@ mailto:
14
15 [Desktop Action AboutDialog]
16 _Name=About @APP_NAME@
17 Exec=@EXEC_NAME@ --about
18-
19-[Desktop Action Compose]
20-_Name=Compose Message
21-Exec=@EXEC_NAME@ mailto:
22-
23
24=== modified file 'po/extra/extra.pot'
25--- po/extra/extra.pot 2016-05-30 04:09:56 +0000
26+++ po/extra/extra.pot 2016-06-03 00:34:15 +0000
27@@ -8,7 +8,7 @@
28 msgstr ""
29 "Project-Id-Version: PACKAGE VERSION\n"
30 "Report-Msgid-Bugs-To: \n"
31-"POT-Creation-Date: 2016-05-29 21:09-0700\n"
32+"POT-Creation-Date: 2016-06-02 00:59+0400\n"
33 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
34 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
35 "Language-Team: LANGUAGE <LL@li.org>\n"
36@@ -26,8 +26,8 @@
37 msgid "Email;E-mail;Mail;"
38 msgstr ""
39
40+msgid "Compose Message"
41+msgstr ""
42+
43 msgid "About Mail"
44 msgstr ""
45-
46-msgid "Compose Message"
47-msgstr ""
48
49=== modified file 'po/pantheon-mail.pot'
50--- po/pantheon-mail.pot 2016-05-30 04:09:56 +0000
51+++ po/pantheon-mail.pot 2016-06-03 00:34:15 +0000
52@@ -8,7 +8,7 @@
53 msgstr ""
54 "Project-Id-Version: PACKAGE VERSION\n"
55 "Report-Msgid-Bugs-To: \n"
56-"POT-Creation-Date: 2016-05-29 21:09-0700\n"
57+"POT-Creation-Date: 2016-06-02 00:59+0400\n"
58 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
59 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
60 "Language-Team: LANGUAGE <LL@li.org>\n"
61@@ -176,6 +176,7 @@
62 #: ../src/engine/rfc822/rfc822-message.vala:781
63 #: ../src/client/util/util-email.vala:30
64 #: ../src/engine/rfc822/rfc822-message.vala:783
65+#: ../src/engine/rfc822/rfc822-message.vala:775
66 msgid "(no subject)"
67 msgstr ""
68
69@@ -1757,6 +1758,7 @@
70 #: ../src/client/composer/composer-widget.vala:1637
71 #: ../src/client/composer/composer-widget.vala:1601
72 #: ../src/client/composer/composer-widget.vala:1598
73+#: ../src/client/composer/composer-widget.vala:1599
74 msgid "To: "
75 msgstr ""
76
77@@ -1765,6 +1767,7 @@
78 #: ../src/client/composer/composer-widget.vala:1640
79 #: ../src/client/composer/composer-widget.vala:1604
80 #: ../src/client/composer/composer-widget.vala:1601
81+#: ../src/client/composer/composer-widget.vala:1602
82 msgid "Cc: "
83 msgstr ""
84
85@@ -1773,6 +1776,7 @@
86 #: ../src/client/composer/composer-widget.vala:1643
87 #: ../src/client/composer/composer-widget.vala:1607
88 #: ../src/client/composer/composer-widget.vala:1604
89+#: ../src/client/composer/composer-widget.vala:1605
90 msgid "Bcc: "
91 msgstr ""
92
93@@ -1781,6 +1785,7 @@
94 #: ../src/client/composer/composer-widget.vala:1646
95 #: ../src/client/composer/composer-widget.vala:1610
96 #: ../src/client/composer/composer-widget.vala:1607
97+#: ../src/client/composer/composer-widget.vala:1608
98 msgid "Reply-To: "
99 msgstr ""
100
101@@ -1789,6 +1794,7 @@
102 #: ../src/client/composer/composer-widget.vala:1879
103 #: ../src/client/composer/composer-widget.vala:1843
104 #: ../src/client/composer/composer-widget.vala:1840
105+#: ../src/client/composer/composer-widget.vala:1841
106 msgid "Select Color"
107 msgstr ""
108
109@@ -1797,6 +1803,7 @@
110 #: ../src/client/composer/composer-widget.vala:2310
111 #: ../src/client/composer/composer-widget.vala:2274
112 #: ../src/client/composer/composer-widget.vala:2271
113+#: ../src/client/composer/composer-widget.vala:2272
114 msgid "%1$s via %2$s"
115 msgstr ""
116
117@@ -1805,6 +1812,7 @@
118 #: ../src/client/composer/composer-widget.vala:2352
119 #: ../src/client/composer/composer-widget.vala:2315
120 #: ../src/client/composer/composer-widget.vala:2312
121+#: ../src/client/composer/composer-widget.vala:2313
122 msgid "_From:"
123 msgstr ""
124
125@@ -1842,6 +1850,7 @@
126
127 #: ../src/client/components/stock.vala:19 ../data/ui/remove_confirm.ui:153
128 #: ../data/ui/edit_alternate_emails.ui:160 ../data/ui/password-dialog.ui:196
129+#: ../data/ui/remove_confirm.ui:155
130 msgid "_Cancel"
131 msgstr ""
132
133@@ -1867,7 +1876,7 @@
134 msgstr ""
135
136 #: ../src/client/components/stock.vala:30 ../data/ui/remove_confirm.ui:168
137-#: ../src/client/components/stock.vala:29
138+#: ../src/client/components/stock.vala:29 ../data/ui/remove_confirm.ui:170
139 msgid "_Remove"
140 msgstr ""
141

Subscribers

People subscribed via source and target branches