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

[John Lenton]

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

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

[PS Jenkins bot (ps-jenkins)]

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)

[Sergio Schvezov (sergiusens)]

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

review: Approve

=== 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 @@
 	summary := gettext.Gettext("More unread emails available")
 	// TODO it would probably be better to grab the estimate that google returns in the message list.
 	approxUnreadMessages := len(pushMsg)
-	// TRANSLATORS: the first %d refers to approximate additionl email message count
-	body := fmt.Sprintf(gettext.Gettext("You have an approximate of %d additional unread messages"), approxUnreadMessages)
+	// TRANSLATORS: the first %d refers to approximate additional email message count
+	body := fmt.Sprintf(gettext.Gettext("You have about %d more unread messages"), approxUnreadMessages)
 	// fmt with label personal and no threadId
 	action := fmt.Sprintf(gmailDispatchUrl, "personal")
 	epoch := time.Now().Unix()

=== 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 @@
 msgstr ""
 "Project-Id-Version: account-polld\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-01 17:45-0300\n"
+"POT-Creation-Date: 2015-03-27 11:39+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,55 +17,20 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANSLATORS: This represents a message summary about more facebook messages
-#: plugins/facebook/facebook.go:365
-msgid "Multiple more messages"
-msgstr ""
-
-#. TRANSLATORS: This represents a message body with the comma separated facebook usernames
-#. TRANSLATORS: This represents a notification body with the comma separated facebook usernames
-#. TRANSLATORS: This represents a notification body with the comma separated twitter usernames
-#: plugins/facebook/facebook.go:367 plugins/facebook/facebook.go:416
-#: plugins/twitter/twitter.go:130 plugins/twitter/twitter.go:187
-#, c-format
-msgid "From %s"
-msgstr ""
-
-#. TRANSLATORS: This represents a notification summary about more facebook notifications
-#: plugins/facebook/facebook.go:414
-msgid "Multiple more notifications"
-msgstr ""
-
-#. TRANSLATORS: The first %s refers to the twitter user's Name, the second %s to the username.
-#: plugins/twitter/twitter.go:113 plugins/twitter/twitter.go:170
-#, c-format
-msgid "%s. @%s"
-msgstr ""
-
-#. TRANSLATORS: This represents a notification summary about more twitter mentions available
-#: plugins/twitter/twitter.go:128
-msgid "Multiple more mentions"
-msgstr ""
-
-#. TRANSLATORS: This represents a notification summary about more twitter direct messages available
-#: plugins/twitter/twitter.go:185
-msgid "Multiple direct messages available"
-msgstr ""
-
 #. TRANSLATORS: the %s is an appended "from" corresponding to an specific email thread
-#: plugins/gmail/gmail.go:157
+#: plugins/gmail/gmail.go:167
 #, c-format
 msgid ", %s"
 msgstr ""
 
 #. TRANSLATORS: the %s is the "from" header corresponding to a specific email
-#: plugins/gmail/gmail.go:160
+#: plugins/gmail/gmail.go:170
 #, c-format
 msgid "%s"
 msgstr ""
 
 #. TRANSLATORS: the first %s refers to the email "subject", the second %s refers "from"
-#: plugins/gmail/gmail.go:162
+#: plugins/gmail/gmail.go:172
 #, c-format
 msgid ""
 "%s\n"
@@ -73,24 +38,51 @@
 msgstr ""
 
 #. TRANSLATORS: This represents a notification summary about more unread emails
-#: plugins/gmail/gmail.go:180
+#: plugins/gmail/gmail.go:190
 msgid "More unread emails available"
 msgstr ""
 
-#. TRANSLATORS: the first %d refers to approximate additionl email message count
-#: plugins/gmail/gmail.go:184
-#, c-format
-msgid "You have an approximate of %d additional unread messages"
+#. TRANSLATORS: the first %d refers to approximate additional email message count
+#: plugins/gmail/gmail.go:194
+#, c-format
+msgid "You have about %d more unread messages"
+msgstr ""
+
+#. TRANSLATORS: The first %s refers to the twitter user's Name, the second %s to the username.
+#: plugins/twitter/twitter.go:112 plugins/twitter/twitter.go:172
+#, c-format
+msgid "%s. @%s"
+msgstr ""
+
+#. TRANSLATORS: This represents a notification summary about more twitter mentions available
+#: plugins/twitter/twitter.go:131
+msgid "Multiple more mentions"
+msgstr ""
+
+#. TRANSLATORS: This represents a notification body with the comma separated twitter usernames
+#. TRANSLATORS: This represents a message body with the comma separated facebook usernames
+#. TRANSLATORS: This represents a notification body with the comma separated facebook usernames
+#: plugins/twitter/twitter.go:133 plugins/twitter/twitter.go:194
+#: plugins/facebook/facebook.go:356 plugins/facebook/facebook.go:407
+#, c-format
+msgid "From %s"
+msgstr ""
+
+#. TRANSLATORS: This represents a notification summary about more twitter direct messages available
+#: plugins/twitter/twitter.go:192
+msgid "Multiple direct messages available"
+msgstr ""
+
+#. TRANSLATORS: This represents a message summary about more facebook messages
+#: plugins/facebook/facebook.go:354
+msgid "Multiple more messages"
+msgstr ""
+
+#. TRANSLATORS: This represents a notification summary about more facebook notifications
+#: plugins/facebook/facebook.go:405
+msgid "Multiple more notifications"
 msgstr ""
 
 #: data/account-polld.desktop.tr.h:1
 msgid "Notifications"
 msgstr ""
-
-#: data/account-polld.application.tr.h:1
-msgid "Account Polling"
-msgstr ""
-
-#: data/account-polld.application.tr.h:2
-msgid "Receive notifications for this account"
-msgstr ""