Merge lp:~sergiusens/account-polld/design_updates_for_card_strings into lp:~ubuntu-push-hackers/account-polld/trunk

[Sergio Schvezov]

Design updates for card strings for twitter and gmail.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/account-polld-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/34/console

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

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/account-polld/design_updates_for_card_strings]

44. By Sergio Schvezov on 2014-08-01

Pumping code updates from lp:~ralsina/account-polld/i18n (implies trunk)

45. By Sergio Schvezov on 2014-08-01

Add translator comments in the code

46. By Sergio Schvezov on 2014-08-01

Fixing message string and adding missing TRANSLATORS text

47. By Sergio Schvezov on 2014-08-01

recreated .pot by running xgettext -kGettext -c -o po/account-polld.pot plugins/gmail/gmail.go plugins/twitter/twitter.go

48. By Sergio Schvezov on 2014-08-01

Fixing translation typos

49. By Sergio Schvezov on 2014-08-01

Updating tests

50. By Sergio Schvezov on 2014-08-01

Fixing inverse logic for address parse

Unmerged revisions

=== modified file 'cmd/account-polld/main.go'
--- cmd/account-polld/main.go	2014-07-24 05:41:02 +0000
+++ cmd/account-polld/main.go	2014-08-01 04:53:22 +0000
@@ -25,6 +25,7 @@
 	"log"
 
 	"launchpad.net/account-polld/accounts"
+	"launchpad.net/account-polld/gettext"
 	"launchpad.net/account-polld/plugins"
 	"launchpad.net/account-polld/plugins/facebook"
 	"launchpad.net/account-polld/plugins/gmail"
@@ -58,6 +59,10 @@
 	// TODO NewAccount called here is just for playing purposes.
 	postWatch := make(chan *PostWatch)
 
+	// Initialize i18n
+	gettext.SetLocale(gettext.LC_ALL, "")
+	gettext.Textdomain("account-polld")
+	gettext.BindTextdomain("account-polld", "/usr/share/locale")
 	if bus, err := dbus.Connect(dbus.SessionBus); err != nil {
 		log.Fatal("Cannot connect to bus", err)
 	} else {

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-31 21:51:53 +0000
+++ debian/changelog	2014-08-01 04:53:22 +0000
@@ -18,6 +18,9 @@
   * Set the default sound to a path relative to an XDG_DATA_DIR as the
     push client searches within those paths.
 
+  [ Roberto Alsina ]
+  * Added i18n support
+
  -- Ubuntu daily release <[e-mail]>  Mon, 28 Jul 2014 16:54:41 +0000
 
 account-polld (0.1+14.10.20140725-0ubuntu1) utopic; urgency=low

=== modified file 'debian/control'
--- debian/control	2014-07-24 21:15:11 +0000
+++ debian/control	2014-08-01 04:53:22 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-golang,
+               dh-translations,
                golang-go,
                golang-go-dbus-dev,
                golang-go-xdg-dev,
@@ -29,3 +30,4 @@
  communicates with the postal service provided by the ubuntu push client
  to expose notifications for the click webapps for the aforementioned
  services.
+X-Ubuntu-Use-Langpack: yes

=== modified file 'debian/copyright'
--- debian/copyright	2014-07-23 18:31:38 +0000
+++ debian/copyright	2014-08-01 04:53:22 +0000
@@ -19,7 +19,29 @@
  .
  On Debian systems, the complete text of the Apache License, Version 2
  can be found in "/usr/share/common-licenses/Apache-2.0".
- 
+
+Files: gettext/*
+Copyright: 2012-2013 José Carlos Nieto
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 Files: *
 Copyright: Copyright (C) 2013 Canonical, Ltd.
 License: GPL-3

=== modified file 'debian/rules' (properties changed: -x to +x)
--- debian/rules	2014-07-25 19:01:28 +0000
+++ debian/rules	2014-08-01 04:53:22 +0000
@@ -11,6 +11,7 @@
 	dh $@ \
 		--buildsystem=golang \
 		--with=golang \
+		--with=translations \
 		--fail-missing
 
 override_dh_auto_install:

=== added directory 'gettext'
=== added file 'gettext/LICENSE'
--- gettext/LICENSE	1970-01-01 00:00:00 +0000
+++ gettext/LICENSE	2014-08-01 04:53:22 +0000
@@ -0,0 +1,20 @@
+Copyright (c) 2012-2013 José Carlos Nieto, http://xiam.menteslibres.org/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

=== added file 'gettext/README.md'
--- gettext/README.md	1970-01-01 00:00:00 +0000
+++ gettext/README.md	2014-08-01 04:53:22 +0000
@@ -0,0 +1,94 @@
+# gosexy/gettext
+
+Go bindings for [GNU gettext][1], an internationalization and localization
+library for writing multilingual systems.
+
+## Requeriments
+
+The GNU C library. If you're using GNU/Linux, FreeBSD or OSX you should already
+have it.
+
+## Installation
+
+Use `go get` to download and install the binding:
+
+```sh
+go get github.com/gosexy/gettext
+```
+
+## Usage
+
+```go
+package main
+
+import (
+	"github.com/gosexy/gettext"
+	"fmt"
+	"os"
+)
+
+func main() {
+	gettext.BindTextdomain("example", ".")
+	gettext.Textdomain("example")
+
+	os.Setenv("LANGUAGE", "es_MX.utf8")
+
+	gettext.SetLocale(gettext.LC_ALL, "")
+
+	fmt.Println(gettext.Gettext("Hello, world!"))
+}
+```
+
+You can use `os.Setenv` to set the `LANGUAGE` environment variable or set it
+on a terminal:
+
+```sh
+export LANGUAGE="es_MX.utf8"
+./gettext-program
+```
+
+Note that `xgettext` does not officially support Go syntax yet, however, you
+can generate a valid `.pot` file by forcing `xgettest` to use the C++
+syntax:
+
+```sh
+xgettext -d example -s gettext_test.go -o example.pot -L c++ -i \
+--keyword=NGettext:1,2 --keyword=Gettext
+```
+
+This will generate a `example.pot` file.
+
+After translating the `.pot` file, you must generate `.po` and `.mo` files and
+remember to set the UTF-8 charset.
+
+```sh
+msginit -l es_MX -o example.po -i example.pot
+msgfmt -c -v -o example.mo example.po
+```
+
+Finally, move the `.mo` file to an appropriate location.
+
+```sh
+mv example.mo examples/es_MX.utf8/LC_MESSAGES/example.mo
+```
+
+## Documentation
+
+You can read `gosexy/gettext` documentation from a terminal
+
+```sh
+go doc github.com/gosexy/gettext
+```
+
+Or you can [browse it](http://godoc.org/github.com/gosexy/gettext) online.
+
+The original gettext documentation could be very useful as well:
+
+```sh
+man 3 gettext
+```
+
+Here's another [good tutorial][2] on using gettext.
+
+[1]: http://www.gnu.org/software/gettext/
+[2]: http://oriya.sarovar.org/docs/gettext_single.html

=== added file 'gettext/gettext.go'
--- gettext/gettext.go	1970-01-01 00:00:00 +0000
+++ gettext/gettext.go	2014-08-01 04:53:22 +0000
@@ -0,0 +1,207 @@
+/*
+  Copyright (c) 2012 José Carlos Nieto, http://xiam.menteslibres.org/
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+package gettext
+
+/*
+
+#include <libintl.h>
+#include <locale.h>
+#include <stdlib.h>
+*/
+import "C"
+
+import (
+	"fmt"
+	"strings"
+	"unsafe"
+)
+
+var (
+	// For all of the locale.
+	LC_ALL = uint(C.LC_ALL)
+
+	// For regular expression matching (it determines the meaning of range
+	// expressions and equivalence classes) and string collation.
+	LC_COLATE = uint(C.LC_ALL)
+
+	// For regular expression matching, character classification, conversion,
+	// case-sensitive comparison, and wide character functions.
+	LC_CTYPE = uint(C.LC_CTYPE)
+
+	// For localizable natural-language messages.
+	LC_MESSAGES = uint(C.LC_MESSAGES)
+
+	// For monetary formatting.
+	LC_MONETARY = uint(C.LC_MONETARY)
+
+	// For number formatting (such as the decimal point and the thousands
+	// separator).
+	LC_NUMERIC = uint(C.LC_NUMERIC)
+
+	// For time and date formatting.
+	LC_TIME = uint(C.LC_TIME)
+)
+
+// Sets or queries the program's current locale.
+func SetLocale(category uint, locale string) string {
+	clocale := C.CString(locale)
+
+	res := C.GoString(C.setlocale(C.int(category), clocale))
+
+	C.free(unsafe.Pointer(clocale))
+	return res
+}
+
+// Sets directory containing message catalogs.
+func BindTextdomain(domainname string, dirname string) string {
+	cdirname := C.CString(dirname)
+	cdomainname := C.CString(domainname)
+
+	res := C.GoString(C.bindtextdomain(cdomainname, cdirname))
+
+	C.free(unsafe.Pointer(cdirname))
+	C.free(unsafe.Pointer(cdomainname))
+	return res
+}
+
+// Sets the output codeset for message catalogs for domain domainname.
+func BindTextdomainCodeset(domainname string, codeset string) string {
+	cdomainname := C.CString(domainname)
+	ccodeset := C.CString(codeset)
+
+	res := C.GoString(C.bind_textdomain_codeset(cdomainname, ccodeset))
+
+	C.free(unsafe.Pointer(cdomainname))
+	C.free(unsafe.Pointer(ccodeset))
+	return res
+}
+
+// Sets or retrieves the current message domain.
+func Textdomain(domainname string) string {
+	cdomainname := C.CString(domainname)
+
+	res := C.GoString(C.textdomain(cdomainname))
+
+	C.free(unsafe.Pointer(cdomainname))
+	return res
+}
+
+// Attempt to translate a text string into the user's native language, by
+// looking up the translation in a message catalog.
+func Gettext(msgid string) string {
+	cmsgid := C.CString(msgid)
+
+	res := C.GoString(C.gettext(cmsgid))
+
+	C.free(unsafe.Pointer(cmsgid))
+	return res
+}
+
+// Like Gettext(), but looking up the message in the specified domain.
+func DGettext(domain string, msgid string) string {
+	cdomain := C.CString(domain)
+	cmsgid := C.CString(msgid)
+
+	res := C.GoString(C.dgettext(cdomain, cmsgid))
+
+	C.free(unsafe.Pointer(cdomain))
+	C.free(unsafe.Pointer(cmsgid))
+	return res
+}
+
+// Like Gettext(), but looking up the message in the specified domain and
+// category.
+func DCGettext(domain string, msgid string, category uint) string {
+	cdomain := C.CString(domain)
+	cmsgid := C.CString(msgid)
+
+	res := C.GoString(C.dcgettext(cdomain, cmsgid, C.int(category)))
+
+	C.free(unsafe.Pointer(cdomain))
+	C.free(unsafe.Pointer(cmsgid))
+	return res
+}
+
+// Attempt to translate a text string into the user's native language, by
+// looking up the appropriate plural form of the translation in a message
+// catalog.
+func NGettext(msgid string, msgid_plural string, n uint64) string {
+	cmsgid := C.CString(msgid)
+	cmsgid_plural := C.CString(msgid_plural)
+
+	res := C.GoString(C.ngettext(cmsgid, cmsgid_plural, C.ulong(n)))
+
+	C.free(unsafe.Pointer(cmsgid))
+	C.free(unsafe.Pointer(cmsgid_plural))
+
+	return res
+}
+
+// Like fmt.Sprintf() but without %!(EXTRA) errors.
+func Sprintf(format string, a ...interface{}) string {
+	expects := strings.Count(format, "%") - strings.Count(format, "%%")
+
+	if expects > 0 {
+		arguments := make([]interface{}, expects)
+		for i := 0; i < expects; i++ {
+			if len(a) > i {
+				arguments[i] = a[i]
+			}
+		}
+		return fmt.Sprintf(format, arguments...)
+	}
+
+	return format
+}
+
+// Like NGettext(), but looking up the message in the specified domain.
+func DNGettext(domainname string, msgid string, msgid_plural string, n uint64) string {
+	cdomainname := C.CString(domainname)
+	cmsgid := C.CString(msgid)
+	cmsgid_plural := C.CString(msgid_plural)
+
+	res := C.GoString(C.dngettext(cdomainname, cmsgid, cmsgid_plural, C.ulong(n)))
+
+	C.free(unsafe.Pointer(cdomainname))
+	C.free(unsafe.Pointer(cmsgid))
+	C.free(unsafe.Pointer(cmsgid_plural))
+
+	return res
+}
+
+// Like NGettext(), but looking up the message in the specified domain and
+// category.
+func DCNGettext(domainname string, msgid string, msgid_plural string, n uint64, category uint) string {
+	cdomainname := C.CString(domainname)
+	cmsgid := C.CString(msgid)
+	cmsgid_plural := C.CString(msgid_plural)
+
+	res := C.GoString(C.dcngettext(cdomainname, cmsgid, cmsgid_plural, C.ulong(n), C.int(category)))
+
+	C.free(unsafe.Pointer(cdomainname))
+	C.free(unsafe.Pointer(cmsgid))
+	C.free(unsafe.Pointer(cmsgid_plural))
+
+	return res
+}

=== modified file 'plugins/gmail/gmail.go'
--- plugins/gmail/gmail.go	2014-07-29 11:45:57 +0000
+++ plugins/gmail/gmail.go	2014-08-01 04:53:22 +0000
@@ -21,11 +21,13 @@
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/mail"
 	"net/url"
 	"os"
 	"sort"
 
 	"launchpad.net/account-polld/accounts"
+	"launchpad.net/account-polld/gettext"
 	"launchpad.net/account-polld/plugins"
 )
 
@@ -90,12 +92,25 @@
 
 	for _, msg := range messages {
 		hdr := msg.Payload.mapHeaders()
+
+		from := hdr[hdrFROM]
+		if emailAddress, err := mail.ParseAddress(hdr[hdrFROM]); err != nil {
+			if emailAddress.Name != "" {
+				from = emailAddress.Name
+			}
+		}
+
 		if _, ok := pushMsgMap[msg.ThreadId]; ok {
-			pushMsgMap[msg.ThreadId].Notification.Card.Summary += fmt.Sprintf(", %s", hdr[hdrFROM])
+			pushMsgMap[msg.ThreadId].Notification.Card.Summary += fmt.Sprintf(", %s", from)
 		} else {
-			summary := fmt.Sprintf("Message \"%s\" from %s", hdr[hdrSUBJECT], hdr[hdrFROM])
+			summary := fmt.Sprintf(gettext.Gettext("%s"), hdr[hdrSUBJECT], from)
+			body := fmt.Sprintf(gettext.Gettext("%s\n%s"), hdr[hdrSUBJECT], msg.Snippet)
 			action := "https://mail.google.com/mail/u/0/?pli=1#inbox/" + msg.ThreadId
+<<<<<<< TREE
 			pushMsgMap[msg.ThreadId] = *plugins.NewStandardPushMessage(summary, msg.Snippet, action, "")
+=======
+			pushMsgMap[msg.ThreadId] = *plugins.NewStandardPushMessage(summary, body, action, gmailIcon)
+>>>>>>> MERGE-SOURCE
 		}
 	}
 	var pushMsg []plugins.PushMessage

=== modified file 'plugins/twitter/twitter.go'
--- plugins/twitter/twitter.go	2014-07-29 11:45:57 +0000
+++ plugins/twitter/twitter.go	2014-08-01 04:53:22 +0000
@@ -26,6 +26,7 @@
 	"strings"
 
 	"launchpad.net/account-polld/accounts"
+	"launchpad.net/account-polld/gettext"
 	"launchpad.net/account-polld/plugins"
 	"launchpad.net/account-polld/plugins/twitter/oauth" // "github.com/garyburd/go-oauth/oauth"
 )
@@ -105,7 +106,15 @@
 
 	pushMsg := []plugins.PushMessage{}
 	for _, s := range statuses {
+<<<<<<< TREE
 		summary := fmt.Sprintf("@%s mentioned you", s.User.ScreenName)
+=======
+		icon, err := plugins.DownloadAvatar(pluginName, s.User.Image)
+		if err != nil {
+			icon = twitterIcon
+		}
+		summary := fmt.Sprintf(gettext.Gettext("%s. @%s"), s.User.Name, s.User.ScreenName)
+>>>>>>> MERGE-SOURCE
 		action := fmt.Sprintf("http://mobile.twitter.com/%s/statuses/%d", s.User.ScreenName, s.Id)
 		pushMsg = append(pushMsg, *plugins.NewStandardPushMessage(summary, s.Text, action, s.User.Image))
 		if len(pushMsg) == maxIndividualStatuses {
@@ -116,10 +125,10 @@
 	if len(statuses) > len(pushMsg) {
 		var screennames []string
 		for _, s := range statuses[consolidatedStatusIndexStart:] {
-			screennames = append(screennames, s.User.ScreenName)
+			screennames = append(screennames, "@"+s.User.ScreenName)
 		}
-		summary := "Multiple more mentions"
-		body := fmt.Sprintf("From %s", strings.Join(screennames, ", "))
+		summary := gettext.Gettext("Multiple more mentions")
+		body := fmt.Sprintf(gettext.Gettext("From %s"), strings.Join(screennames, ", "))
 		action := "http://mobile.twitter.com/i/connect"
 		pushMsg = append(pushMsg, *plugins.NewStandardPushMessage(summary, body, action, ""))
 	}
@@ -157,7 +166,15 @@
 
 	pushMsg := []plugins.PushMessage{}
 	for _, m := range dms {
+<<<<<<< TREE
 		summary := fmt.Sprintf("@%s sent you a DM", m.Sender.ScreenName)
+=======
+		icon, err := plugins.DownloadAvatar(pluginName, m.Sender.Image)
+		if err != nil {
+			icon = twitterIcon
+		}
+		summary := fmt.Sprintf(gettext.Gettext("%s. @%s"), m.Sender.Name, m.Sender.ScreenName)
+>>>>>>> MERGE-SOURCE
 		action := fmt.Sprintf("http://mobile.twitter.com/%s/messages", m.Sender.ScreenName)
 		pushMsg = append(pushMsg, *plugins.NewStandardPushMessage(summary, m.Text, action, m.Sender.Image))
 		if len(pushMsg) == maxIndividualDirectMessages {
@@ -168,10 +185,10 @@
 	if len(dms) > len(pushMsg) {
 		var senders []string
 		for _, m := range dms[consolidatedDirectMessageIndexStart:] {
-			senders = append(senders, m.Sender.ScreenName)
+			senders = append(senders, "@"+m.Sender.ScreenName)
 		}
-		summary := "Multiple direct messages available"
-		body := fmt.Sprintf("From %s", strings.Join(senders, ", "))
+		summary := gettext.Gettext("Multiple direct messages available")
+		body := fmt.Sprintf(gettext.Gettext("From %s"), strings.Join(senders, ", "))
 		action := "http://mobile.twitter.com/messages"
 		pushMsg = append(pushMsg, *plugins.NewStandardPushMessage(summary, body, action, ""))
 	}

=== added directory 'po'
=== added file 'po/account-polld.pot'
--- po/account-polld.pot	1970-01-01 00:00:00 +0000
+++ po/account-polld.pot	2014-08-01 04:53:22 +0000
@@ -0,0 +1,48 @@
+# Account-polld translation data
+# Copyright (C) 2014 Canonical Ltd.
+# This file is distributed under the same license as the account-polld package.
+#
+#, fuzzy
+msgid   ""
+msgstr  "Project-Id-Version: PACKAGE VERSION\n"
+        "Report-Msgid-Bugs-To: \n"
+        "POT-Creation-Date: 2014-07-29 15:28-0300\n"
+        "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+        "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+        "Language-Team: LANGUAGE <[e-mail]>\n"
+        "Language: \n"
+        "MIME-Version: 1.0\n"
+        "Content-Type: text/plain; charset=UTF-8\n"
+        "Content-Transfer-Encoding: 8bit\n"
+
+#: plugins/gmail/gmail.go:108
+#, c-format
+msgid   "%s"
+msgstr  ""
+
+#. This is the email subject followed by the message snippet
+#: plugins/gmail/gmail.go:109
+#, c-format
+msgid   "%s\n%s"
+msgstr  ""
+
+#. This is the twitter users Name followed by the username.
+#: plugins/twitter/twitter.go:118
+#: plugins/twitter/twitter.go:174
+#, c-format
+msgid   "%s. @%s"
+msgstr  ""
+
+#: plugins/twitter/twitter.go:131
+msgid   "Multiple more mentions"
+msgstr  ""
+
+#. From followed by the list of twitter usernames.
+#: plugins/twitter/twitter.go:132
+#: plugins/twitter/twitter.go:175
+msgid   "From %s"
+msgstr  ""
+
+#: plugins/twitter/twitter.go:187
+msgid   "Multiple direct messages available"
+msgstr  ""