Merge lp:~artem-anufrij/switchboard-plug-onlineaccounts/Bugfix-1366492 into lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk

[Artem Anufrij]

Added "Includes Contacts, Mails, and Calendar" to translatable strings file

[Phillip Sz (phillip-sz)]

you should remove the changes in the pot file :)

[Artem Anufrij (artem-anufrij)]

I changed only Translation.vala. Was it wrong?

[Cody Garver (codygarver)]

We prefer that po/pantheon-online-accounts.pot be modified in a separate trunk commit instead of included with code changes

I merged this branch with the po changes reverted

review: Approve

=== modified file 'po/pantheon-online-accounts.pot'
--- po/pantheon-online-accounts.pot	2014-08-07 03:07:51 +0000
+++ po/pantheon-online-accounts.pot	2014-09-17 20:02:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-06 22:07-0500\n"
+"POT-Creation-Date: 2014-09-17 21:50+0200\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,166 +17,170 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:57
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:34
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:66
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:57
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:34
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:64
 msgid "Cancel"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:59
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:115
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:59
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:115
 msgid "Please enter your credentials…"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:75
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:75
 msgid "Username:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:77
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:77
 msgid "john_doe"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:79
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:79
 msgid "Password:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:83
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:83
 msgid "New Password:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:87
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:87
 msgid "Confirm Password:"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:92
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:92
 msgid "Remember password"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:94
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:160
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:94
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:160
 msgid "Forgot password"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:99
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:99
 msgid "Refresh Captcha"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:100
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:100
 msgid "Enter above text here"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:105
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/GraphicalDialog.vala:105
 msgid "Save"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:38
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:122
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:38
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Authentification/WebDialog.vala:122
 msgid "Loading…"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:24
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Views/AccountView.vala:45
+msgid "Content to synchronise:"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Views/AccountView.vala:88
+msgid "There is no service linked this account."
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:90
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:91
+msgid "Add…"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:95
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:96
+msgid "Remove"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:47
+msgid "Online Accounts"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:48
+msgid "Synchronize your computer with all your online accounts around the web."
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:62
+msgid "Close"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:63
+msgid "Restore"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:145
+msgid "Connect Your Online Accounts"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:145
+msgid "Sign in to connect with apps like Mail, Contacts, and Calendar."
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:243
+#, c-format
+msgid "Account '%s' Removed."
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:256
+msgid "Add a new account…"
+msgstr ""
+
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:24
 msgid "Calendars"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:25
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:25
 msgid "Sync your calendars"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:26
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:26
 msgid "Contacts"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:27
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:27
 msgid "Sync your contacts"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:28
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:28
 msgid "Sync your files"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:29
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:29
 msgid "Emails"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:30
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:30
 msgid "Sync your emails"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:31
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:31
 msgid "Sync your photos"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:32
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:32
 msgid "Watch your newsfeed"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:33
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:33
 msgid "Chat with your friends"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:34
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:34
 msgid "Access all Outlook and OneDrive services on your computer"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:35
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:35
 msgid "Access all Yahoo! services on your computer"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:36
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:36
 msgid "Access all Facebook contents on your computer"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Translation.vala:37
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:37
 msgid "Access all Google services on your computer"
 msgstr ""
 
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Views/AccountView.vala:45
-msgid "Content to synchronise:"
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Views/AccountView.vala:96
-msgid "There is no service linked this account."
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:90
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:91
-msgid "Add…"
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:95
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//Views/SourceSelector.vala:96
-msgid "Remove"
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:49
-msgid "Online Accounts"
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:50
-msgid "Synchronize your computer with all your online accounts around the web."
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:64
-msgid "Close"
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:65
-msgid "Restore"
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:146
-msgid "Connect Your Online Accounts"
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:146
-msgid "Sign in to connect with apps like Mail, Contacts, and Calendar."
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:244
-#, c-format
-msgid "Account '%s' Removed."
-msgstr ""
-
-#: /home/noelco/switchboard-plug-onlineaccounts/po/../src//OnlineAccounts.vala:257
-msgid "Add a new account…"
+#: /home/artem/Launchpad/switchboard-plug-onlineaccounts/po/../src//Translation.vala:38
+msgid "Includes Contacts, Mails, and Calendar"
 msgstr ""

=== modified file 'src/Translation.vala'
--- src/Translation.vala	2014-06-06 11:16:36 +0000
+++ src/Translation.vala	2014-09-17 20:02:25 +0000
@@ -34,4 +34,5 @@
 _("Access all Outlook and OneDrive services on your computer");
 _("Access all Yahoo! services on your computer");
 _("Access all Facebook contents on your computer");
-_("Access all Google services on your computer");
\ No newline at end of file
+_("Access all Google services on your computer");
+_("Includes Contacts, Mails, and Calendar");
\ No newline at end of file