poll-daemon

Merge lp:~chipaca/account-polld/fix-1365206 into lp:~ubuntu-push-hackers/account-polld/trunk

  1. fix-1365206
  2. Merge into trunk
Proposed by John Lenton
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 115
Merged at revision: 119
Proposed branch: lp:~chipaca/account-polld/fix-1365206
Merge into: lp:~ubuntu-push-hackers/account-polld/trunk
Diff against target: 151 lines (+46/-54)
2 files modified
plugins/gmail/gmail.go (+2/-2)
po/account-polld.pot (+44/-52)
To merge this branch: bzr merge lp:~chipaca/account-polld/fix-1365206
Reviewer Review Type Date Requested Status
Sergio Schvezov Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+254383@code.launchpad.net

Commit message

Fix an unfortunate wording (lp:1365206); also, re-ran the update_translations script.

Description of the change

Fix an unfortunate wording; also, re-ran the update_translations script.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/account-polld-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/87/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

No live testing done, but it looks good and according to the bug.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/gmail/gmail.go'
--- plugins/gmail/gmail.go 2015-03-20 14:34:48 +0000
+++ plugins/gmail/gmail.go 2015-03-27 11:47:23 +0000
@@ -190,8 +190,8 @@
190 summary := gettext.Gettext("More unread emails available")190 summary := gettext.Gettext("More unread emails available")
191 // TODO it would probably be better to grab the estimate that google returns in the message list.191 // TODO it would probably be better to grab the estimate that google returns in the message list.
192 approxUnreadMessages := len(pushMsg)192 approxUnreadMessages := len(pushMsg)
193 // TRANSLATORS: the first %d refers to approximate additionl email message count193 // TRANSLATORS: the first %d refers to approximate additional email message count
194 body := fmt.Sprintf(gettext.Gettext("You have an approximate of %d additional unread messages"), approxUnreadMessages)194 body := fmt.Sprintf(gettext.Gettext("You have about %d more unread messages"), approxUnreadMessages)
195 // fmt with label personal and no threadId195 // fmt with label personal and no threadId
196 action := fmt.Sprintf(gmailDispatchUrl, "personal")196 action := fmt.Sprintf(gmailDispatchUrl, "personal")
197 epoch := time.Now().Unix()197 epoch := time.Now().Unix()
198198
=== modified file 'po/account-polld.pot'
--- po/account-polld.pot 2014-09-01 22:54:51 +0000
+++ po/account-polld.pot 2015-03-27 11:47:23 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: account-polld\n"9"Project-Id-Version: account-polld\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-01 17:45-0300\n"11"POT-Creation-Date: 2015-03-27 11:39+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,55 +17,20 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#. TRANSLATORS: This represents a message summary about more facebook messages
21#: plugins/facebook/facebook.go:365
22msgid "Multiple more messages"
23msgstr ""
24
25#. TRANSLATORS: This represents a message body with the comma separated facebook usernames
26#. TRANSLATORS: This represents a notification body with the comma separated facebook usernames
27#. TRANSLATORS: This represents a notification body with the comma separated twitter usernames
28#: plugins/facebook/facebook.go:367 plugins/facebook/facebook.go:416
29#: plugins/twitter/twitter.go:130 plugins/twitter/twitter.go:187
30#, c-format
31msgid "From %s"
32msgstr ""
33
34#. TRANSLATORS: This represents a notification summary about more facebook notifications
35#: plugins/facebook/facebook.go:414
36msgid "Multiple more notifications"
37msgstr ""
38
39#. TRANSLATORS: The first %s refers to the twitter user's Name, the second %s to the username.
40#: plugins/twitter/twitter.go:113 plugins/twitter/twitter.go:170
41#, c-format
42msgid "%s. @%s"
43msgstr ""
44
45#. TRANSLATORS: This represents a notification summary about more twitter mentions available
46#: plugins/twitter/twitter.go:128
47msgid "Multiple more mentions"
48msgstr ""
49
50#. TRANSLATORS: This represents a notification summary about more twitter direct messages available
51#: plugins/twitter/twitter.go:185
52msgid "Multiple direct messages available"
53msgstr ""
54
55#. TRANSLATORS: the %s is an appended "from" corresponding to an specific email thread20#. TRANSLATORS: the %s is an appended "from" corresponding to an specific email thread
56#: plugins/gmail/gmail.go:15721#: plugins/gmail/gmail.go:167
57#, c-format22#, c-format
58msgid ", %s"23msgid ", %s"
59msgstr ""24msgstr ""
6025
61#. TRANSLATORS: the %s is the "from" header corresponding to a specific email26#. TRANSLATORS: the %s is the "from" header corresponding to a specific email
62#: plugins/gmail/gmail.go:16027#: plugins/gmail/gmail.go:170
63#, c-format28#, c-format
64msgid "%s"29msgid "%s"
65msgstr ""30msgstr ""
6631
67#. TRANSLATORS: the first %s refers to the email "subject", the second %s refers "from"32#. TRANSLATORS: the first %s refers to the email "subject", the second %s refers "from"
68#: plugins/gmail/gmail.go:16233#: plugins/gmail/gmail.go:172
69#, c-format34#, c-format
70msgid ""35msgid ""
71"%s\n"36"%s\n"
@@ -73,24 +38,51 @@
73msgstr ""38msgstr ""
7439
75#. TRANSLATORS: This represents a notification summary about more unread emails40#. TRANSLATORS: This represents a notification summary about more unread emails
76#: plugins/gmail/gmail.go:18041#: plugins/gmail/gmail.go:190
77msgid "More unread emails available"42msgid "More unread emails available"
78msgstr ""43msgstr ""
7944
80#. TRANSLATORS: the first %d refers to approximate additionl email message count45#. TRANSLATORS: the first %d refers to approximate additional email message count
81#: plugins/gmail/gmail.go:18446#: plugins/gmail/gmail.go:194
82#, c-format47#, c-format
83msgid "You have an approximate of %d additional unread messages"48msgid "You have about %d more unread messages"
49msgstr ""
50
51#. TRANSLATORS: The first %s refers to the twitter user's Name, the second %s to the username.
52#: plugins/twitter/twitter.go:112 plugins/twitter/twitter.go:172
53#, c-format
54msgid "%s. @%s"
55msgstr ""
56
57#. TRANSLATORS: This represents a notification summary about more twitter mentions available
58#: plugins/twitter/twitter.go:131
59msgid "Multiple more mentions"
60msgstr ""
61
62#. TRANSLATORS: This represents a notification body with the comma separated twitter usernames
63#. TRANSLATORS: This represents a message body with the comma separated facebook usernames
64#. TRANSLATORS: This represents a notification body with the comma separated facebook usernames
65#: plugins/twitter/twitter.go:133 plugins/twitter/twitter.go:194
66#: plugins/facebook/facebook.go:356 plugins/facebook/facebook.go:407
67#, c-format
68msgid "From %s"
69msgstr ""
70
71#. TRANSLATORS: This represents a notification summary about more twitter direct messages available
72#: plugins/twitter/twitter.go:192
73msgid "Multiple direct messages available"
74msgstr ""
75
76#. TRANSLATORS: This represents a message summary about more facebook messages
77#: plugins/facebook/facebook.go:354
78msgid "Multiple more messages"
79msgstr ""
80
81#. TRANSLATORS: This represents a notification summary about more facebook notifications
82#: plugins/facebook/facebook.go:405
83msgid "Multiple more notifications"
84msgstr ""84msgstr ""
8585
86#: data/account-polld.desktop.tr.h:186#: data/account-polld.desktop.tr.h:1
87msgid "Notifications"87msgid "Notifications"
88msgstr ""88msgstr ""
89
90#: data/account-polld.application.tr.h:1
91msgid "Account Polling"
92msgstr ""
93
94#: data/account-polld.application.tr.h:2
95msgid "Receive notifications for this account"
96msgstr ""

Subscribers

People subscribed via source and target branches