Update translations from source

diff --git a/package/po/Makefile b/package/po/Makefile
index 5d23d1e..9af7798 100644 (file)
--- a/package/po/Makefile
+++ b/package/po/Makefile
@@ -27,12 +27,13 @@ DISTFILES = Makefile POTFILES.in $(POFILES)
 EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
 
 POTFILES = \
-       ../src/org/maemo/hermes/engine/twitter/provider.py \
+       ../src/org/maemo/hermes/gui/accountsdialogue.py     \
+       ../src/org/maemo/hermes/gui/gtkui.py                \
+       ../src/org/maemo/hermes/gui/searchablelist.py       \
+       ../src/org/maemo/hermes/engine/provider.py          \
+       ../src/org/maemo/hermes/engine/provider_oauth.py    \
        ../src/org/maemo/hermes/engine/linkedin/provider.py \
        ../src/org/maemo/hermes/engine/facebook/provider.py \
-       ../src/org/maemo/hermes/gui/gtkui.py \
-       ../src/org/maemo/hermes/gui/accountsdialogue.py \
-       ../src/org/bleb/wimpworks.py \
 # This comment gets stripped out
 
 CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)

diff --git a/package/po/fi_FI.po b/package/po/fi_FI.po
index 815ceca..c1f157a 100644 (file)
--- a/package/po/fi_FI.po
+++ b/package/po/fi_FI.po
@@ -1,12 +1,12 @@
 # This is fi_FI translation file for Hermes.
 # Copyright (C) 2009 Marko Vertainen <marko.vertainen@iki.fi>
 # This file is distributed under the same license as the hermes package.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: hermes\n"
-"Report-Msgid-Bugs-To: https://bugs.maemo.org/enter_bug.cgi?product=Hermes\n"
-"POT-Creation-Date: 2010-08-02 21:50+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-30 17:05+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Marko Vertainen <marko.vertainen@iki.fi>\n"
 "Language-Team: Finnish <>\n"
@@ -14,61 +14,13 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:40
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:52
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:66
-msgid "Disable"
-msgstr "Poista käytöstä"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:41
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:53
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:67
-msgid "Enable"
-msgstr "Ota käyttöön"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:46
-msgid "Username"
-msgstr "Käyttäjänimi"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:59
-msgid "Password"
-msgstr "Salasana"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:77
-msgid "Clear authorisation"
-msgstr "Poista valtuutus"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-msgid "Authorise"
-msgstr "Valtuuta"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:96
-#: ../src/org/maemo/hermes/gui/gtkui.py:238
-msgid "Service authorisation"
-msgstr "Palvelun valtuutus"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:97
-#: ../src/org/maemo/hermes/gui/gtkui.py:239
-msgid "Validate"
-msgstr "Tarkista oikeellisuus"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:101
-#: ../src/org/maemo/hermes/gui/gtkui.py:243
-msgid "Verification code from web browser"
-msgstr "Varmistuskoodi web-selaimesta"
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:50
-msgid "Pending authorisation"
-msgstr "Odottava valtuutus"
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:70
-msgid "Create birthday-only contacts"
-msgstr "Luo pelkän syntymäpäivän sisältäviä yhteystietoja"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
+msgid "Accounts"
+msgstr "Tilit"
 
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:73
-msgid "Note: authentication via web page"
-msgstr "Huom: tunnistautuminen web-sivun kautta"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
+msgid "Save"
+msgstr "Tallenna"
 
 #: ../src/org/maemo/hermes/gui/gtkui.py:33
 msgid "Get contacts' missing info"
@@ -103,50 +55,70 @@ msgstr "Ongelma tunnistautumisessa. Tarkista kirjautumistiedot."
 msgid "Network connection error. Check connectivity."
 msgstr "Ongelmia verkkoyhteydessä. Tarkista verkkoyhteys."
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:151
+#: ../src/org/maemo/hermes/gui/gtkui.py:150
+#, python-format
+msgid "Credentials expired. Please reauthorise %s."
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:154
 msgid "Something went wrong: "
 msgstr "Jokin meni pieleen:"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:158
+#: ../src/org/maemo/hermes/gui/gtkui.py:161
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:159
+#: ../src/org/maemo/hermes/gui/gtkui.py:162
 msgid "Done"
 msgstr "Valmis"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:162
+#: ../src/org/maemo/hermes/gui/gtkui.py:165
 #, python-format
 msgid "Updated %d contacts"
 msgstr "%d yhteystietoa päivitettiin"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:168
+#: ../src/org/maemo/hermes/gui/gtkui.py:171
 #, python-format
 msgid "Matched %d contacts"
 msgstr "%d yhteystietoa täsmää"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:174
+#: ../src/org/maemo/hermes/gui/gtkui.py:177
 #, python-format
 msgid "%d contacts unmatched"
 msgstr "%d yhteystietoa ei täsmää"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:188
+#: ../src/org/maemo/hermes/gui/gtkui.py:191
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:203
+#: ../src/org/maemo/hermes/gui/gtkui.py:206
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:214
+#: ../src/org/maemo/hermes/gui/gtkui.py:217
 msgid "Removing existing mappings is not yet supported"
 msgstr "Olemassa olevien tietojen poisto ei ole vielä tuettu"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:228
+#: ../src/org/maemo/hermes/gui/gtkui.py:231
 msgid "Need to authenticate via browser"
 msgstr "Täytyy tunnistautua web-selaimella"
 
+#: ../src/org/maemo/hermes/gui/gtkui.py:241
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:137
+msgid "Service authorisation"
+msgstr "Palvelun valtuutus"
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:242
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:138
+msgid "Validate"
+msgstr "Tarkista oikeellisuus"
+
 #: ../src/org/maemo/hermes/gui/gtkui.py:246
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:142
+msgid "Verification code from web browser"
+msgstr "Varmistuskoodi web-selaimesta"
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:249
 msgid ""
 "\n"
 "Press 'Validate' once account has\n"
@@ -156,17 +128,50 @@ msgstr ""
 "Valitse 'Tarkista oikeellisuus', kun\n"
 "olet tunnistautunut web-selaimella.\n"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:274
+#: ../src/org/maemo/hermes/gui/gtkui.py:277
 msgid "Initialising connections"
 msgstr "Valmistellaan yhteyksiä"
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
-msgid "Accounts"
-msgstr "Tilit"
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:76
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:62
+msgid "Disable"
+msgstr "Poista käytöstä"
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
-msgid "Save"
-msgstr "Tallenna"
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:77
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:63
+msgid "Enable"
+msgstr "Ota käyttöön"
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Clear authorisation"
+msgstr "Poista valtuutus"
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Authorise"
+msgstr "Valtuuta"
+
+#: ../src/org/maemo/hermes/engine/linkedin/provider.py:46
+#, fuzzy
+msgid "Import new contacts"
+msgstr "Päivitetään yhteystietoja"
+
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:72
+msgid "Create birthday-only contacts"
+msgstr "Luo pelkän syntymäpäivän sisältäviä yhteystietoja"
+
+#~ msgid "Username"
+#~ msgstr "Käyttäjänimi"
+
+#~ msgid "Password"
+#~ msgstr "Salasana"
+
+#~ msgid "Pending authorisation"
+#~ msgstr "Odottava valtuutus"
+
+#~ msgid "Note: authentication via web page"
+#~ msgstr "Huom: tunnistautuminen web-sivun kautta"
 
 #~ msgid "Retrieve"
 #~ msgstr "Nouda"
@@ -206,6 +211,3 @@ msgstr "Tallenna"
 
 #~ msgid "Fetching friends' info"
 #~ msgstr "Noudetaan ystävien tietoja"
-
-#~ msgid "Updating contacts"
-#~ msgstr "Päivitetään yhteystietoja"

diff --git a/package/po/fr_FR.po b/package/po/fr_FR.po
index 7454e78..ce2aef3 100644 (file)
--- a/package/po/fr_FR.po
+++ b/package/po/fr_FR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hermes\n"
-"Report-Msgid-Bugs-To: https://bugs.maemo.org/enter_bug.cgi?product=Hermes\n"
-"POT-Creation-Date: 2010-08-02 21:50+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-30 17:05+0000\n"
 "PO-Revision-Date: 2010-08-02 22:02+0200\n"
 "Last-Translator: Nicolas Graziano <nicolas.graziano@gmail.com>\n"
 "Language-Team: French <>\n"
@@ -15,61 +15,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:40
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:52
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:66
-msgid "Disable"
-msgstr "Désactiver"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:41
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:53
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:67
-msgid "Enable"
-msgstr "Activer"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:46
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:59
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:77
-msgid "Clear authorisation"
-msgstr "Effacer l'authorisation"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-msgid "Authorise"
-msgstr "Autoriser"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:96
-#: ../src/org/maemo/hermes/gui/gtkui.py:238
-msgid "Service authorisation"
-msgstr "Autorisation du service"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:97
-#: ../src/org/maemo/hermes/gui/gtkui.py:239
-msgid "Validate"
-msgstr "Valider"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:101
-#: ../src/org/maemo/hermes/gui/gtkui.py:243
-msgid "Verification code from web browser"
-msgstr "Code de vérification depuis le navigateur"
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:50
-msgid "Pending authorisation"
-msgstr "Attente d'autorisation"
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:70
-msgid "Create birthday-only contacts"
-msgstr "Créer des contacts anniversaire."
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
+msgid "Accounts"
+msgstr "Comptes"
 
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:73
-msgid "Note: authentication via web page"
-msgstr "Remarque : authentification par page web"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
+msgid "Save"
+msgstr "Enregistrer"
 
 #: ../src/org/maemo/hermes/gui/gtkui.py:33
 msgid "Get contacts' missing info"
@@ -109,50 +61,70 @@ msgstr ""
 msgid "Network connection error. Check connectivity."
 msgstr "Erreur de connexion réseau. Vérifier la connectivité."
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:151
+#: ../src/org/maemo/hermes/gui/gtkui.py:150
+#, python-format
+msgid "Credentials expired. Please reauthorise %s."
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:154
 msgid "Something went wrong: "
 msgstr "Il y a eu une erreur :"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:158
+#: ../src/org/maemo/hermes/gui/gtkui.py:161
 msgid "Summary"
 msgstr "Résumé"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:159
+#: ../src/org/maemo/hermes/gui/gtkui.py:162
 msgid "Done"
 msgstr "Terminer"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:162
+#: ../src/org/maemo/hermes/gui/gtkui.py:165
 #, python-format
 msgid "Updated %d contacts"
 msgstr "%d contacts mis à jour"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:168
+#: ../src/org/maemo/hermes/gui/gtkui.py:171
 #, python-format
 msgid "Matched %d contacts"
 msgstr "%d contacts rapprochés"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:174
+#: ../src/org/maemo/hermes/gui/gtkui.py:177
 #, python-format
 msgid "%d contacts unmatched"
 msgstr "%d contacts non rapprochés"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:188
+#: ../src/org/maemo/hermes/gui/gtkui.py:191
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:203
+#: ../src/org/maemo/hermes/gui/gtkui.py:206
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:214
+#: ../src/org/maemo/hermes/gui/gtkui.py:217
 msgid "Removing existing mappings is not yet supported"
 msgstr "Supprimer les rapprochement existant n'ai pas encore supporté"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:228
+#: ../src/org/maemo/hermes/gui/gtkui.py:231
 msgid "Need to authenticate via browser"
 msgstr "Authentification par le navigateur nécessaire."
 
+#: ../src/org/maemo/hermes/gui/gtkui.py:241
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:137
+msgid "Service authorisation"
+msgstr "Autorisation du service"
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:242
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:138
+msgid "Validate"
+msgstr "Valider"
+
 #: ../src/org/maemo/hermes/gui/gtkui.py:246
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:142
+msgid "Verification code from web browser"
+msgstr "Code de vérification depuis le navigateur"
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:249
 msgid ""
 "\n"
 "Press 'Validate' once account has\n"
@@ -162,17 +134,50 @@ msgstr ""
 "Appuyer sur 'Valider' quand le compte\n"
 "a été authentifier dans le navigateur.\n"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:274
+#: ../src/org/maemo/hermes/gui/gtkui.py:277
 msgid "Initialising connections"
 msgstr "Initialisation de la connexion."
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
-msgid "Accounts"
-msgstr "Comptes"
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:76
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:62
+msgid "Disable"
+msgstr "Désactiver"
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
-msgid "Save"
-msgstr "Enregistrer"
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:77
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:63
+msgid "Enable"
+msgstr "Activer"
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Clear authorisation"
+msgstr "Effacer l'authorisation"
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Authorise"
+msgstr "Autoriser"
+
+#: ../src/org/maemo/hermes/engine/linkedin/provider.py:46
+#, fuzzy
+msgid "Import new contacts"
+msgstr "Mise à jour des contacts"
+
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:72
+msgid "Create birthday-only contacts"
+msgstr "Créer des contacts anniversaire."
+
+#~ msgid "Username"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "Pending authorisation"
+#~ msgstr "Attente d'autorisation"
+
+#~ msgid "Note: authentication via web page"
+#~ msgstr "Remarque : authentification par page web"
 
 #~ msgid "Retrieve"
 #~ msgstr "Récupérer"
@@ -215,6 +220,3 @@ msgstr "Enregistrer"
 
 #~ msgid "Fetching friends' info"
 #~ msgstr "Lecture des informations des amis"
-
-#~ msgid "Updating contacts"
-#~ msgstr "Mise à jour des contacts"

diff --git a/package/po/hermes.pot b/package/po/hermes.pot
index 2f7bf58..42d1034 100644 (file)
--- a/package/po/hermes.pot
+++ b/package/po/hermes.pot
@@ -1,14 +1,13 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Hermes translations
+# Copyright (C) Andrew Flegg <andrew@bleb.org> 2010
+# Released under the artistic licence
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: hermes\n"
-"Report-Msgid-Bugs-To: https://bugs.maemo.org/enter_bug.cgi?product=Hermes\n"
-"POT-Creation-Date: 2010-08-02 21:50+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-30 17:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,60 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:40
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:52
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:66
-msgid "Disable"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:41
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:53
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:67
-msgid "Enable"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:46
-msgid "Username"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:59
-msgid "Password"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:77
-msgid "Clear authorisation"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-msgid "Authorise"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:96
-#: ../src/org/maemo/hermes/gui/gtkui.py:238
-msgid "Service authorisation"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:97
-#: ../src/org/maemo/hermes/gui/gtkui.py:239
-msgid "Validate"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:101
-#: ../src/org/maemo/hermes/gui/gtkui.py:243
-msgid "Verification code from web browser"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:50
-msgid "Pending authorisation"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:70
-msgid "Create birthday-only contacts"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
+msgid "Accounts"
 msgstr ""
 
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:73
-msgid "Note: authentication via web page"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
+msgid "Save"
 msgstr ""
 
 #: ../src/org/maemo/hermes/gui/gtkui.py:33
@@ -105,64 +56,104 @@ msgstr ""
 msgid "Network connection error. Check connectivity."
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:151
+#: ../src/org/maemo/hermes/gui/gtkui.py:150
+#, python-format
+msgid "Credentials expired. Please reauthorise %s."
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:154
 msgid "Something went wrong: "
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:158
+#: ../src/org/maemo/hermes/gui/gtkui.py:161
 msgid "Summary"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:159
+#: ../src/org/maemo/hermes/gui/gtkui.py:162
 msgid "Done"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:162
+#: ../src/org/maemo/hermes/gui/gtkui.py:165
 #, python-format
 msgid "Updated %d contacts"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:168
+#: ../src/org/maemo/hermes/gui/gtkui.py:171
 #, python-format
 msgid "Matched %d contacts"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:174
+#: ../src/org/maemo/hermes/gui/gtkui.py:177
 #, python-format
 msgid "%d contacts unmatched"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:188
+#: ../src/org/maemo/hermes/gui/gtkui.py:191
 msgid "Contacts"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:203
+#: ../src/org/maemo/hermes/gui/gtkui.py:206
 msgid "Update"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:214
+#: ../src/org/maemo/hermes/gui/gtkui.py:217
 msgid "Removing existing mappings is not yet supported"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:228
+#: ../src/org/maemo/hermes/gui/gtkui.py:231
 msgid "Need to authenticate via browser"
 msgstr ""
 
+#: ../src/org/maemo/hermes/gui/gtkui.py:241
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:137
+msgid "Service authorisation"
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:242
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:138
+msgid "Validate"
+msgstr ""
+
 #: ../src/org/maemo/hermes/gui/gtkui.py:246
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:142
+msgid "Verification code from web browser"
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:249
 msgid ""
 "\n"
 "Press 'Validate' once account has\n"
 "been authorised in web browser.\n"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:274
+#: ../src/org/maemo/hermes/gui/gtkui.py:277
 msgid "Initialising connections"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
-msgid "Accounts"
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:76
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:62
+msgid "Disable"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
-msgid "Save"
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:77
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:63
+msgid "Enable"
+msgstr ""
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Clear authorisation"
+msgstr ""
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Authorise"
+msgstr ""
+
+#: ../src/org/maemo/hermes/engine/linkedin/provider.py:46
+msgid "Import new contacts"
+msgstr ""
+
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:72
+msgid "Create birthday-only contacts"
 msgstr ""

diff --git a/package/po/pl_PL.po b/package/po/pl_PL.po
index 1986db2..506b779 100644 (file)
--- a/package/po/pl_PL.po
+++ b/package/po/pl_PL.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hermes\n"
-"Report-Msgid-Bugs-To: https://bugs.maemo.org/enter_bug.cgi?product=Hermes\n"
-"POT-Creation-Date: 2010-08-02 21:50+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-30 17:05+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
 "Language-Team: Polish <dominikowski@gmail.com>\n"
@@ -16,64 +16,14 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:40
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:52
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:66
-msgid "Disable"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:41
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:53
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:67
-msgid "Enable"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:46
-msgid "Username"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:59
-msgid "Password"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:77
-#, fuzzy
-msgid "Clear authorisation"
-msgstr "Uwierzytelnienie w Facebook"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-msgid "Authorise"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:96
-#: ../src/org/maemo/hermes/gui/gtkui.py:238
-#, fuzzy
-msgid "Service authorisation"
-msgstr "Uwierzytelnienie w Facebook"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:97
-#: ../src/org/maemo/hermes/gui/gtkui.py:239
-msgid "Validate"
-msgstr "Potwierdź"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:101
-#: ../src/org/maemo/hermes/gui/gtkui.py:243
-msgid "Verification code from web browser"
-msgstr ""
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:50
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
 #, fuzzy
-msgid "Pending authorisation"
-msgstr "Uwierzytelnienie w Facebook"
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:70
-msgid "Create birthday-only contacts"
-msgstr "Twórz kontakty tylko z datami urodzin"
+msgid "Accounts"
+msgstr "Konta"
 
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:73
-msgid "Note: authentication via web page"
-msgstr "Uwaga: uwierzytelnienie przez witrynę"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
+msgid "Save"
+msgstr "Zapisz"
 
 #: ../src/org/maemo/hermes/gui/gtkui.py:33
 msgid "Get contacts' missing info"
@@ -109,51 +59,72 @@ msgstr "Problem z uwierzytelnieniem. Proszę sprawdzić uprawnienia."
 msgid "Network connection error. Check connectivity."
 msgstr "Błąd połączenia sieciowego. Proszę sprawdzić łączność."
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:151
+#: ../src/org/maemo/hermes/gui/gtkui.py:150
+#, python-format
+msgid "Credentials expired. Please reauthorise %s."
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:154
 msgid "Something went wrong: "
 msgstr "Coś poszło źle:"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:158
+#: ../src/org/maemo/hermes/gui/gtkui.py:161
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:159
+#: ../src/org/maemo/hermes/gui/gtkui.py:162
 msgid "Done"
 msgstr "Gotowe"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:162
+#: ../src/org/maemo/hermes/gui/gtkui.py:165
 #, python-format
 msgid "Updated %d contacts"
 msgstr "Kontaktów zaktualizowanych: %d"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:168
+#: ../src/org/maemo/hermes/gui/gtkui.py:171
 #, python-format
 msgid "Matched %d contacts"
 msgstr "Kontaktów dopasowanych: %d"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:174
+#: ../src/org/maemo/hermes/gui/gtkui.py:177
 #, python-format
 msgid "%d contacts unmatched"
 msgstr "Kontaktów niedopasowanych: %d"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:188
+#: ../src/org/maemo/hermes/gui/gtkui.py:191
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:203
+#: ../src/org/maemo/hermes/gui/gtkui.py:206
 msgid "Update"
 msgstr "Zaktualizuj"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:214
+#: ../src/org/maemo/hermes/gui/gtkui.py:217
 msgid "Removing existing mappings is not yet supported"
 msgstr "Usuwanie istniejących mapowań nie jest jeszcze obsługiwane"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:228
+#: ../src/org/maemo/hermes/gui/gtkui.py:231
 #, fuzzy
 msgid "Need to authenticate via browser"
 msgstr "Należy się uwierzytelnić w Facebook"
 
+#: ../src/org/maemo/hermes/gui/gtkui.py:241
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:137
+#, fuzzy
+msgid "Service authorisation"
+msgstr "Uwierzytelnienie w Facebook"
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:242
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:138
+msgid "Validate"
+msgstr "Potwierdź"
+
 #: ../src/org/maemo/hermes/gui/gtkui.py:246
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:142
+msgid "Verification code from web browser"
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:249
 #, fuzzy
 msgid ""
 "\n"
@@ -164,18 +135,46 @@ msgstr ""
 "Naciśnij \"Potwierdź\" po uwierzytelnieniu\n"
 "w Facebook przez przeglądarkę.\n"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:274
+#: ../src/org/maemo/hermes/gui/gtkui.py:277
 msgid "Initialising connections"
 msgstr ""
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:76
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:62
+msgid "Disable"
+msgstr ""
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:77
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:63
+msgid "Enable"
+msgstr ""
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
 #, fuzzy
-msgid "Accounts"
-msgstr "Konta"
+msgid "Clear authorisation"
+msgstr "Uwierzytelnienie w Facebook"
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
-msgid "Save"
-msgstr "Zapisz"
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Authorise"
+msgstr ""
+
+#: ../src/org/maemo/hermes/engine/linkedin/provider.py:46
+#, fuzzy
+msgid "Import new contacts"
+msgstr "Aktualizowanie kontaktów"
+
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:72
+msgid "Create birthday-only contacts"
+msgstr "Twórz kontakty tylko z datami urodzin"
+
+#, fuzzy
+#~ msgid "Pending authorisation"
+#~ msgstr "Uwierzytelnienie w Facebook"
+
+#~ msgid "Note: authentication via web page"
+#~ msgstr "Uwaga: uwierzytelnienie przez witrynę"
 
 #~ msgid "Retrieve"
 #~ msgstr "Pobierz"
@@ -218,6 +217,3 @@ msgstr "Zapisz"
 
 #~ msgid "Fetching friends' info"
 #~ msgstr "Pobieranie informacji o znajomych"
-
-#~ msgid "Updating contacts"
-#~ msgstr "Aktualizowanie kontaktów"

diff --git a/package/po/sv_SE.po b/package/po/sv_SE.po
index 6a0d522..a824c38 100644 (file)
--- a/package/po/sv_SE.po
+++ b/package/po/sv_SE.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hermes\n"
-"Report-Msgid-Bugs-To: https://bugs.maemo.org/enter_bug.cgi?product=Hermes\n"
-"POT-Creation-Date: 2010-08-02 21:50+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-30 17:05+0000\n"
 "PO-Revision-Date: 2010-10-24 12:11+0200\n"
 "Last-Translator: Fredrik Wendt <fredrik@wendt.se>\n"
 "Language-Team: Swedish <>\n"
@@ -15,61 +15,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:40
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:52
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:66
-msgid "Disable"
-msgstr "Inaktivera"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:41
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:53
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:67
-msgid "Enable"
-msgstr "Aktivera"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:46
-msgid "Username"
-msgstr "Användarnamn"
-
-#: ../src/org/maemo/hermes/engine/twitter/provider.py:59
-msgid "Password"
-msgstr "Lösenord"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:77
-msgid "Clear authorisation"
-msgstr "Rensa auktorisering"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:86
-msgid "Authorise"
-msgstr "Auktorisera"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:96
-#: ../src/org/maemo/hermes/gui/gtkui.py:238
-msgid "Service authorisation"
-msgstr "Auktorisering av tjänst"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:97
-#: ../src/org/maemo/hermes/gui/gtkui.py:239
-msgid "Validate"
-msgstr "Kontrollera"
-
-#: ../src/org/maemo/hermes/engine/linkedin/provider.py:101
-#: ../src/org/maemo/hermes/gui/gtkui.py:243
-msgid "Verification code from web browser"
-msgstr "Bekräftelsekod från webbläsaren"
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:50
-msgid "Pending authorisation"
-msgstr "Auktorisering ofullständig"
-
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:70
-msgid "Create birthday-only contacts"
-msgstr "Importera kontakter med endast födelsedag"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
+#, fuzzy
+msgid "Accounts"
+msgstr "Konton"
 
-#: ../src/org/maemo/hermes/engine/facebook/provider.py:73
-msgid "Note: authentication via web page"
-msgstr "Obs: autentisering via webbläsare"
+#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
+msgid "Save"
+msgstr "Spara"
 
 #: ../src/org/maemo/hermes/gui/gtkui.py:33
 msgid "Get contacts' missing info"
@@ -104,50 +57,70 @@ msgstr "Autentiseringsproblem. Kontrollera inloggningsuppgifterna."
 msgid "Network connection error. Check connectivity."
 msgstr "Nätverksfel. Kontrollera anslutningen."
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:151
+#: ../src/org/maemo/hermes/gui/gtkui.py:150
+#, python-format
+msgid "Credentials expired. Please reauthorise %s."
+msgstr ""
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:154
 msgid "Something went wrong: "
 msgstr "Något gick fel:"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:158
+#: ../src/org/maemo/hermes/gui/gtkui.py:161
 msgid "Summary"
 msgstr "Sammanfattning"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:159
+#: ../src/org/maemo/hermes/gui/gtkui.py:162
 msgid "Done"
 msgstr "Klar"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:162
+#: ../src/org/maemo/hermes/gui/gtkui.py:165
 #, python-format
 msgid "Updated %d contacts"
 msgstr "Uppdaterade %d kontakter"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:168
+#: ../src/org/maemo/hermes/gui/gtkui.py:171
 #, python-format
 msgid "Matched %d contacts"
 msgstr "Matchade %d kontakter"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:174
+#: ../src/org/maemo/hermes/gui/gtkui.py:177
 #, python-format
 msgid "%d contacts unmatched"
 msgstr "%d kontakter kunde inte matchas"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:188
+#: ../src/org/maemo/hermes/gui/gtkui.py:191
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:203
+#: ../src/org/maemo/hermes/gui/gtkui.py:206
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:214
+#: ../src/org/maemo/hermes/gui/gtkui.py:217
 msgid "Removing existing mappings is not yet supported"
 msgstr "Borttagande av matchningar stöds inte ännu"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:228
+#: ../src/org/maemo/hermes/gui/gtkui.py:231
 msgid "Need to authenticate via browser"
 msgstr "Behöver autentisera via webbläsare"
 
+#: ../src/org/maemo/hermes/gui/gtkui.py:241
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:137
+msgid "Service authorisation"
+msgstr "Auktorisering av tjänst"
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:242
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:138
+msgid "Validate"
+msgstr "Kontrollera"
+
 #: ../src/org/maemo/hermes/gui/gtkui.py:246
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:142
+msgid "Verification code from web browser"
+msgstr "Bekräftelsekod från webbläsaren"
+
+#: ../src/org/maemo/hermes/gui/gtkui.py:249
 msgid ""
 "\n"
 "Press 'Validate' once account has\n"
@@ -157,15 +130,47 @@ msgstr ""
 "Tryck \"Kontrollera\" efter du loggat in\n"
 "och godkänt tjänsten via webbläsaren.\n"
 
-#: ../src/org/maemo/hermes/gui/gtkui.py:274
+#: ../src/org/maemo/hermes/gui/gtkui.py:277
 msgid "Initialising connections"
 msgstr "Initierar anslutningar"
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:41
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:76
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:62
+msgid "Disable"
+msgstr "Inaktivera"
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:77
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:63
+msgid "Enable"
+msgstr "Aktivera"
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Clear authorisation"
+msgstr "Rensa auktorisering"
+
+#: ../src/org/maemo/hermes/engine/provider_oauth.py:127
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:102
+msgid "Authorise"
+msgstr "Auktorisera"
+
+#: ../src/org/maemo/hermes/engine/linkedin/provider.py:46
 #, fuzzy
-msgid "Accounts"
-msgstr "Konton"
+msgid "Import new contacts"
+msgstr "Uppdaterade %d kontakter"
 
-#: ../src/org/maemo/hermes/gui/accountsdialogue.py:42
-msgid "Save"
-msgstr "Spara"
+#: ../src/org/maemo/hermes/engine/facebook/provider.py:72
+msgid "Create birthday-only contacts"
+msgstr "Importera kontakter med endast födelsedag"
+
+#~ msgid "Username"
+#~ msgstr "Användarnamn"
+
+#~ msgid "Password"
+#~ msgstr "Lösenord"
+
+#~ msgid "Pending authorisation"
+#~ msgstr "Auktorisering ofullständig"
+
+#~ msgid "Note: authentication via web page"
+#~ msgstr "Obs: autentisering via webbläsare"