tux-droid-svn Mailing List for Tux Droid CE (Page 11)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2009-10-28 12:41:51
|
Author: jerome Date: 2009-10-28 13:14:00 +0100 (Wed, 28 Oct 2009) New Revision: 5778 Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot Log: * Added a new string. Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po 2009-10-28 10:06:46 UTC (rev 5777) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po 2009-10-28 12:14:00 UTC (rev 5778) @@ -96,3 +96,5 @@ msgid "You don't have any event invites" msgstr "Sie haben keine Veranstaltungeinladungen" +msgid "You do not seem to be connected. Please, verify you username and password, then try again." +msgstr "Anscheinend sind Sie nicht mit dem Internet verbunden. Prüfen Sie Benutzername und Passwort und versuchen Sie es danach wieder." Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po 2009-10-28 10:06:46 UTC (rev 5777) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po 2009-10-28 12:14:00 UTC (rev 5778) @@ -96,3 +96,5 @@ msgid "You don't have any event invites" msgstr "You don't have any event invites" +msgid "You do not seem to be connected. Please, verify you username and password, then try again." +msgstr "You do not seem to be connected. Please, verify you username and password, then try again." Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po 2009-10-28 10:06:46 UTC (rev 5777) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po 2009-10-28 12:14:00 UTC (rev 5778) @@ -96,3 +96,5 @@ msgid "You don't have any event invites" msgstr "Vous n'êtes invité à aucun évènement" +msgid "You do not seem to be connected. Please, verify you username and password, then try again." +msgstr "Il semble que vous ne soyez pas connecté. Vérifiez votre login et votre mot de passe et essayez à nouveau." Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po 2009-10-28 10:06:46 UTC (rev 5777) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po 2009-10-28 12:14:00 UTC (rev 5778) @@ -96,3 +96,5 @@ msgid "You don't have any event invites" msgstr "Je hebt geen evenementsuitnodigingen" +msgid "You do not seem to be connected. Please, verify you username and password, then try again." +msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven." Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot 2009-10-28 10:06:46 UTC (rev 5777) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot 2009-10-28 12:14:00 UTC (rev 5778) @@ -84,3 +84,6 @@ msgid "You don't have any event invites" msgstr "" + +msgid "You do not seem to be connected. Please, verify you username and password, then try again." +msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-10-28 12:41:11
|
Author: jerome
Date: 2009-10-28 13:40:53 +0100 (Wed, 28 Oct 2009)
New Revision: 5780
Added:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookLoginException.java
Log:
* Forget to add new exception class.
Added: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookLoginException.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookLoginException.java (rev 0)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookLoginException.java 2009-10-28 12:40:53 UTC (rev 5780)
@@ -0,0 +1,7 @@
+package com.kysoh.plugins.facebook.connection;
+
+public class FacebookLoginException extends Exception{
+
+ private static final long serialVersionUID = 1L;
+
+}
|
|
From: jerome <c2m...@c2...> - 2009-10-28 12:38:42
|
Author: jerome
Date: 2009-10-28 13:38:30 +0100 (Wed, 28 Oct 2009)
New Revision: 5779
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Facebook error string improvement.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-28 12:14:00 UTC (rev 5778)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-28 12:38:30 UTC (rev 5779)
@@ -27,6 +27,7 @@
import com.google.code.facebookapi.FacebookException;
import com.google.code.facebookapi.FacebookJsonRestClient;
import com.kysoh.plugins.facebook.connection.BareBonesBrowserLaunch;
+import com.kysoh.plugins.facebook.connection.FacebookLoginException;
import com.kysoh.plugins.facebook.connection.FacebookSessionUtils;
public class FacebookConnection {
@@ -74,7 +75,7 @@
- public boolean Connect(String username, String password)
+ public boolean Connect(String username, String password) throws FacebookLoginException
{
FacebookSessionUtils.setMail(username);
FacebookSessionUtils.setPass(password);
@@ -110,7 +111,10 @@
}
catch (FacebookException e)
{
- //e.printStackTrace();
+ if(e.getMessage().equalsIgnoreCase("invalid parameter"))
+ {
+ throw new FacebookLoginException();
+ }
}
catch (IOException e)
{
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-28 12:14:00 UTC (rev 5778)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-28 12:38:30 UTC (rev 5779)
@@ -28,6 +28,7 @@
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
import com.kysoh.plugins.facebook.configuration.FacebookDatasStruct;
import com.kysoh.plugins.facebook.configuration.PluginFacebookConfiguration;
+import com.kysoh.plugins.facebook.connection.FacebookLoginException;
import com.kysoh.plugins.facebook.connection.FacebookPromptException;
import com.kysoh.plugins.facebook.FacebookConnection;
@@ -97,8 +98,20 @@
{
FacebookConnection facebook = new FacebookConnection();
- if ( facebook.Connect(this.configuration().getLogin(), this.configuration().getPassword()) )
+ boolean connected = false;
+
+ try
{
+ connected = facebook.Connect(this.configuration().getLogin(), this.configuration().getPassword());
+ }
+ catch (FacebookLoginException e)
+ {
+ this.throwMessage("You do not seem to be connected. Please, verify you username and password, then try again.");
+ System.exit( 0 );
+ }
+
+ if ( connected )
+ {
//Facebook global functions object.
functions = new FacebookFunctions(facebook.getClient());
|
|
From: jerome <c2m...@c2...> - 2009-10-28 10:07:03
|
Author: jerome
Date: 2009-10-28 11:06:46 +0100 (Wed, 28 Oct 2009)
New Revision: 5777
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po
Log:
* Updated german dutch po file.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po 2009-10-28 09:47:15 UTC (rev 5776)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po 2009-10-28 10:06:46 UTC (rev 5777)
@@ -1,98 +1,98 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Facebook Plugin"
-msgstr "Facebook Plugin"
-
-msgid "The Facebook plugin will notify you of any updates on your Facebook account."
-msgstr "Dieses Facebook-Plugin weist Sie auf alle Updates Ihres Facebook-Kontos hin."
-
-msgid "Login"
-msgstr "Login"
-
-msgid "Password"
-msgstr "Kennwort"
-
-msgid "Check number of messages"
-msgstr "Die Anzahl der Nachrichten prüfen"
-
-msgid "Check friend requests"
-msgstr "Friend Requests prüfen"
-
-msgid "Check group invites"
-msgstr "Gruppeneinladungen prüfen"
-
-msgid "Check event invites"
-msgstr "Event-Einladungen prüfen"
-
-msgid "Update user status"
-msgstr ""
-
-msgid "Feed to add"
-msgstr ""
-
-msgid "Hello all from my Tux Droid Facebook gadget"
-msgstr "Hallo an alle von meinem Facebook - Tux Droid"
-
-msgid "Run to check your Facebook account"
-msgstr "Start zur Prüfung Ihres Facebook-Kontos"
-
-msgid "Check your Facebook account"
-msgstr "Mein Facebook-Konto überprüfen."
-
-msgid "Configure Tux Droid Facebook permissions"
-msgstr ""
-
-msgid "Start every x"
-msgstr "Hinweise"
-
-msgid "Start me every x"
-msgstr "Überprüfen Sie mein Twitter-Konto automatisch"
-
-msgid "Please, allow me to access your Facebook account"
-msgstr ""
-
-msgid "I cannot get connected to your facebook account."
-msgstr ""
-
-msgid "Your new status was published"
-msgstr ""
-
-msgid "An error occured trying to set your new status, please, allow me to access your wall"
-msgstr ""
-
-msgid "You don't have any messages"
-msgstr "Sie haben keine Nachrichten."
-
-msgid "One message from {0}"
-msgstr "Sie haben eine Nachricht von {0}."
-
-msgid "{0} messages from {1}"
-msgstr "Sie haben {0} Nachrichten von {1}."
-
-msgid "{0} requests to be your friend"
-msgstr ""
-
-msgid "You don't have any friend requests"
-msgstr ""
-
-msgid "You are invited to this group: {0}"
-msgstr ""
-
-msgid "You don't have any group invites"
-msgstr ""
-
-msgid "You are invited to the event: {0}"
-msgstr ""
-
-msgid "You don't have any event invites"
-msgstr ""
-
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Facebook Plugin"
+msgstr "Facebook Plugin"
+
+msgid "The Facebook plugin will notify you of any updates on your Facebook account."
+msgstr "Dieses Facebook-Plugin weist Sie auf alle Updates Ihres Facebook-Kontos hin."
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Password"
+msgstr "Kennwort"
+
+msgid "Check number of messages"
+msgstr "Die Anzahl der Nachrichten prüfen"
+
+msgid "Check friend requests"
+msgstr "Friend Requests prüfen"
+
+msgid "Check group invites"
+msgstr "Gruppeneinladungen prüfen"
+
+msgid "Check event invites"
+msgstr "Event-Einladungen prüfen"
+
+msgid "Update user status"
+msgstr "Statusmeldung aktualisieren"
+
+msgid "Feed to add"
+msgstr "Statusmeldung"
+
+msgid "Hello all from my Tux Droid Facebook gadget"
+msgstr "Hallo an alle von meinem Facebook - Tux Droid"
+
+msgid "Run to check your Facebook account"
+msgstr "Start zur Prüfung Ihres Facebook-Kontos"
+
+msgid "Check your Facebook account"
+msgstr "Mein Facebook-Konto überprüfen."
+
+msgid "Configure Tux Droid Facebook permissions"
+msgstr "Konfigurieren Sie Ihren Tux Droid Facebook Berechtigungen"
+
+msgid "Start every x"
+msgstr "Hinweise"
+
+msgid "Start me every x"
+msgstr "Überprüfen Sie mein Twitter-Konto automatisch"
+
+msgid "Please, allow me to access your Facebook account"
+msgstr "Bitte gestatten Sie mir, Ihre Facebook-Konto zugreifen"
+
+msgid "I cannot get connected to your facebook account."
+msgstr "Sorry, Bei der Verbindung mit Facebook gab es einen Fehler."
+
+msgid "Your new status was published"
+msgstr "Ihre neue Statusmeldung wurde hinzugefügt"
+
+msgid "An error occured trying to set your new status, please, allow me to access your wall"
+msgstr "Sorry, Bei der Verbindung mit Facebook gab es einen Fehler. Bitte, prüfen Sie Ihre Facebook Berechtigungen"
+
+msgid "You don't have any messages"
+msgstr "Sie haben keine Nachrichten."
+
+msgid "One message from {0}"
+msgstr "Sie haben eine Nachricht von {0}."
+
+msgid "{0} messages from {1}"
+msgstr "Sie haben {0} Nachrichten von {1}."
+
+msgid "{0} requests to be your friend"
+msgstr "Sie haben {0} Freundschaftsanfragen"
+
+msgid "You don't have any friend requests"
+msgstr "Sie haben keine Freundschaftsanfragen"
+
+msgid "You are invited to this group: {0}"
+msgstr "Sie haben eine Gruppeneinladung von: {0}"
+
+msgid "You don't have any group invites"
+msgstr "Sie haben keine Gruppeneinladungen"
+
+msgid "You are invited to the event: {0}"
+msgstr "Sie sind zu einer Veranstaltung eingeladen: {0}"
+
+msgid "You don't have any event invites"
+msgstr "Sie haben keine Veranstaltungeinladungen"
+
|
|
From: jerome <c2m...@c2...> - 2009-10-28 09:47:43
|
Author: jerome
Date: 2009-10-28 10:47:15 +0100 (Wed, 28 Oct 2009)
New Revision: 5776
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Fixed a bug with alert mode.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-28 09:16:20 UTC (rev 5775)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-28 09:47:15 UTC (rev 5776)
@@ -34,7 +34,6 @@
public class FacebookPlugin extends SimplePlugin<PluginFacebookConfiguration>{
- private boolean check = false;
private boolean thrown = false;
@@ -48,7 +47,7 @@
*/
private void throwRes()
{
- if(this.check && (!thrown))
+ if(this.getCommand().equalsIgnoreCase("check") && (!thrown))
{
thrown = true;
this.throwResult(true);
@@ -87,7 +86,7 @@
//Prompt web browser for facebook permissions.
this.throwMessage("Please, allow me to access your Facebook account");
FacebookConnection.promptAuthorizations();
- System.exit( 0 );
+ System.exit(0);
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-28 09:16:32
|
Author: ks156 Date: 2009-10-28 10:16:20 +0100 (Wed, 28 Oct 2009) New Revision: 5775 Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po Log: * Correction of the french strings Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po 2009-10-28 08:42:50 UTC (rev 5774) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po 2009-10-28 09:16:20 UTC (rev 5775) @@ -34,19 +34,19 @@ msgstr "Vérifier les invitations aux évènements" msgid "Update user status" -msgstr "Mettre à jour le status" +msgstr "Mettre à jour le statut" msgid "Feed to add" -msgstr "Post à ajouter" +msgstr "Message à ajouter" msgid "Hello all from my Tux Droid Facebook gadget" msgstr "Bonjour tout le monde depuis mon gadget Facebook Tux Droid" msgid "Run to check your Facebook account" -msgstr "Démarre pour vérifier votre compte Facebook" +msgstr "Démarrer pour vérifier votre compte Facebook" msgid "Check your Facebook account" -msgstr "Vérifie votre compte Facebook" +msgstr "Vérifier votre compte Facebook" msgid "Configure Tux Droid Facebook permissions" msgstr "Configurer les permissions Facebook " @@ -58,16 +58,16 @@ msgstr "Alerte" msgid "Please, allow me to access your Facebook account" -msgstr "S'il vous plait, autorisez moi à accéder à votre compte Facebook" +msgstr "Autorisez moi à accéder à votre compte Facebook" msgid "I cannot get connected to your facebook account." msgstr "Je n'arrive pas à me connecter à votre compte Facebook" msgid "Your new status was published" -msgstr "Votre nouveau status à été publié" +msgstr "Votre nouveau statut a été publié" msgid "An error occured trying to set your new status, please, allow me to access your wall" -msgstr "Une erreur est survenue en tentant de mettre à jour votre nouveau status." +msgstr "Une erreur est survenue en essayant de mettre à jour votre nouveau statut." msgid "You don't have any messages" msgstr "Vous n'avez pas de nouveaux messages" |
|
From: jerome <c2m...@c2...> - 2009-10-28 08:43:06
|
Author: jerome
Date: 2009-10-28 09:42:50 +0100 (Wed, 28 Oct 2009)
New Revision: 5774
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.wiki
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.wiki
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.wiki
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.wiki
Log:
* Updated 'en', 'nl', 'fr' languages.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po 2009-10-28 08:42:50 UTC (rev 5774)
@@ -1,102 +1,98 @@
-msgid "Facebook Plugin"
-msgstr "Facebook Plugin"
-
-msgid "The Facebook plugin will notify you of any updates on your Facebook account."
-msgstr "Dieses Facebook-Plugin weist Sie auf alle Updates Ihres Facebook-Kontos hin."
-
-msgid "Login"
-msgstr "Login"
-
-msgid "your login"
-msgstr "Ihr Login"
-
-msgid "Password"
-msgstr "Kennwort"
-
-msgid "Check number of messages"
-msgstr "Die Anzahl der Nachrichten prüfen"
-
-msgid "Check friend requests"
-msgstr "Friend Requests prüfen"
-
-msgid "Check group invites"
-msgstr "Gruppeneinladungen prüfen"
-
-msgid "Check event invites"
-msgstr "Event-Einladungen prüfen"
-
-msgid "Check pokes"
-msgstr "Pokes prüfen"
-
-msgid "Run to check your facebook account"
-msgstr "Start zur Prüfung Ihres Facebook-Kontos"
-
-msgid "Check your facebook account"
-msgstr "Prüfen Sie Ihr Facebook-Konto"
-
-msgid "Start every x"
-msgstr "Echtzeitbericht"
-
-msgid "Start me every x"
-msgstr "Benachrichtigen Sie mich bei Änderungen in Echtzeit"
-
-msgid "Start me every x (From full hour)"
-msgstr "Ich möchte regelmäßig Facebook-Berichte erhalten"
-
-msgid "You have one new message"
-msgstr "Sie haben eine neue Nachricht"
-
-msgid "You have {0} new messages"
-msgstr "Sie haben {0} neue Nachrichten"
-
-msgid "You have one friend request"
-msgstr "Sie haben eine 'Friend Request'"
-
-msgid "You have {0} friend requests"
-msgstr "Sie haben {0} 'Friend Requests'"
-
-msgid "From {0}"
-msgstr "Von {0}"
-
-msgid "You have one group invite"
-msgstr "Sie haben einen Gruppengast"
-
-msgid "You have {0} group invites"
-msgstr "Sie haben {0} Gruppeneinladungen"
-
-msgid "to {0}"
-msgstr "bis {0}"
-
-msgid "You have one event invite"
-msgstr "Sie haben eine Event-Einladung"
-
-msgid "You have {0} event invites"
-msgstr "Sie haben {0} Event-Einladungen"
-
-msgid "You have one poke"
-msgstr "Sie haben einen Poke"
-
-msgid "You have {0} pokes"
-msgstr "Sie haben {0} Pokes"
-
-msgid "Nothing new on your account"
-msgstr "Nichts Neues auf Ihrem Konto"
-
-msgid "I must be connected to access your facebook account."
-msgstr "Ich muss online sein, um an Ihr Facebook-Konto zu kommen."
-
-msgid "Unknown group"
-msgid "Unbekannte Gruppe"
-
-msgid "Unknown event"
-msgid "Unbekanntes Event"
-
-msgid "I cannot get connected to your facebook account."
-msgstr "Verbindung mit Ihrem Facebook-Konto nicht möglich."
-
-msgid "Start daily at"
-msgstr "Täglicher Facebook-Bericht"
-
-msgid "Start me daily"
-msgstr "Ich möchte einen täglichen Facebook-Bericht"
-
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Facebook Plugin"
+msgstr "Facebook Plugin"
+
+msgid "The Facebook plugin will notify you of any updates on your Facebook account."
+msgstr "Dieses Facebook-Plugin weist Sie auf alle Updates Ihres Facebook-Kontos hin."
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Password"
+msgstr "Kennwort"
+
+msgid "Check number of messages"
+msgstr "Die Anzahl der Nachrichten prüfen"
+
+msgid "Check friend requests"
+msgstr "Friend Requests prüfen"
+
+msgid "Check group invites"
+msgstr "Gruppeneinladungen prüfen"
+
+msgid "Check event invites"
+msgstr "Event-Einladungen prüfen"
+
+msgid "Update user status"
+msgstr ""
+
+msgid "Feed to add"
+msgstr ""
+
+msgid "Hello all from my Tux Droid Facebook gadget"
+msgstr "Hallo an alle von meinem Facebook - Tux Droid"
+
+msgid "Run to check your Facebook account"
+msgstr "Start zur Prüfung Ihres Facebook-Kontos"
+
+msgid "Check your Facebook account"
+msgstr "Mein Facebook-Konto überprüfen."
+
+msgid "Configure Tux Droid Facebook permissions"
+msgstr ""
+
+msgid "Start every x"
+msgstr "Hinweise"
+
+msgid "Start me every x"
+msgstr "Überprüfen Sie mein Twitter-Konto automatisch"
+
+msgid "Please, allow me to access your Facebook account"
+msgstr ""
+
+msgid "I cannot get connected to your facebook account."
+msgstr ""
+
+msgid "Your new status was published"
+msgstr ""
+
+msgid "An error occured trying to set your new status, please, allow me to access your wall"
+msgstr ""
+
+msgid "You don't have any messages"
+msgstr "Sie haben keine Nachrichten."
+
+msgid "One message from {0}"
+msgstr "Sie haben eine Nachricht von {0}."
+
+msgid "{0} messages from {1}"
+msgstr "Sie haben {0} Nachrichten von {1}."
+
+msgid "{0} requests to be your friend"
+msgstr ""
+
+msgid "You don't have any friend requests"
+msgstr ""
+
+msgid "You are invited to this group: {0}"
+msgstr ""
+
+msgid "You don't have any group invites"
+msgstr ""
+
+msgid "You are invited to the event: {0}"
+msgstr ""
+
+msgid "You don't have any event invites"
+msgstr ""
+
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.wiki
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.wiki 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.wiki 2009-10-28 08:42:50 UTC (rev 5774)
@@ -8,5 +8,5 @@
* Friend Requests abfragen: Zeigt die Anzahl und die Namen der wartenden Friend Requests an
* Gruppeneinladungen abfragen: Zeigt die Anzahl und die Namen der eingegangenen Gruppeneinladungen an
* Einladungen zu Events prüfen: Zeigt die Anzahl und die Namen der eingegangenen Event-Einladungen an
-* Pokes prüfen: Zeigt die Anzahl der eingegangenen Pokes an.
+* '''' Update status function here '''''
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.po 2009-10-28 08:42:50 UTC (rev 5774)
@@ -1,3 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
msgid "Facebook Plugin"
msgstr "Facebook Plugin"
@@ -7,9 +18,6 @@
msgid "Login"
msgstr "Login"
-msgid "your login"
-msgstr "your login"
-
msgid "Password"
msgstr "Password"
@@ -25,77 +33,66 @@
msgid "Check event invites"
msgstr "Check event invites"
-msgid "Check pokes"
-msgstr "Check pokes"
+msgid "Update user status"
+msgstr "Update user status"
-msgid "Run to check your facebook account"
-msgstr "Run to check your facebook account"
+msgid "Feed to add"
+msgstr "Feed to add"
-msgid "Check your facebook account"
-msgstr "Check your facebook account"
+msgid "Hello all from my Tux Droid Facebook gadget"
+msgstr "Hello all from my Tux Droid Facebook gadget"
-msgid "Start every x"
-msgstr "Real time report"
+msgid "Run to check your Facebook account"
+msgstr "Run to check your Facebook account"
-msgid "Start me every x"
-msgstr "Notify me of any changes in real time"
+msgid "Check your Facebook account"
+msgstr "Check your Facebook account"
-msgid "Start me every x (From full hour)"
-msgstr "Give me a Facebook report regularly"
+msgid "Configure Tux Droid Facebook permissions"
+msgstr "Configure Tux Droid Facebook permissions"
-msgid "You have one new message"
-msgstr "You have one new message"
+msgid "Start every x"
+msgstr "Alert"
-msgid "You have {0} new messages"
-msgstr "You have {0} new messages"
+msgid "Start me every x"
+msgstr "Alert"
-msgid "You have one friend request"
-msgstr "You have one friend request"
+msgid "Please, allow me to access your Facebook account"
+msgstr "Please, allow me to access your Facebook account"
-msgid "You have {0} friend requests"
-msgstr "You have {0} friend requests"
+msgid "I cannot get connected to your facebook account."
+msgstr "I cannot get connected to your facebook account."
-msgid "From {0}"
-msgstr "From {0}"
+msgid "Your new status was published"
+msgstr "Your new status was published"
-msgid "You have one group invite"
-msgstr "You have one group invite"
+msgid "An error occured trying to set your new status, please, allow me to access your wall"
+msgstr "An error occured trying to set your new status, please, allow me to access your wall"
-msgid "You have {0} group invites"
-msgstr "You have {0} group invites"
+msgid "You don't have any messages"
+msgstr "You don't have any messages"
-msgid "to {0}"
-msgstr "to {0}"
+msgid "One message from {0}"
+msgstr "One message from {0}"
-msgid "You have one event invite"
-msgstr "You have one event invite"
+msgid "{0} messages from {1}"
+msgstr "{0} messages from {1}"
-msgid "You have {0} event invites"
-msgstr "You have {0} event invites"
+msgid "{0} requests to be your friend"
+msgstr "{0} requests to be your friend"
-msgid "You have one poke"
-msgstr "You have one poke"
+msgid "You don't have any friend requests"
+msgstr "You don't have any friend requests"
-msgid "You have {0} pokes"
-msgstr "You have {0} pokes"
+msgid "You are invited to this group: {0}"
+msgstr "You are invited to this group: {0}"
-msgid "Nothing new on your account"
-msgstr "Nothing new on your account"
+msgid "You don't have any group invites"
+msgstr "You don't have any group invites"
-msgid "I must be connected to access your facebook account."
-msgstr "I must be connected to access your facebook account."
+msgid "You are invited to the event: {0}"
+msgstr "You are invited to the event: {0}"
-msgid "Unknown group"
-msgstr "Unknown group"
+msgid "You don't have any event invites"
+msgstr "You don't have any event invites"
-msgid "Unknown event"
-msgstr "Unknown event"
-
-msgid "I cannot get connected to your facebook account."
-msgstr "I cannot get connected to your facebook account."
-
-msgid "Start daily at"
-msgstr "Daily Facebook report"
-
-msgid "Start me daily"
-msgstr "Give me a daily Facebook report"
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.wiki
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.wiki 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/en.wiki 2009-10-28 08:42:50 UTC (rev 5774)
@@ -8,4 +8,4 @@
* Check friend requests : will give the number and name of waiting friend requests
* Check group invites : will give the number and name of received group invites
* Check event invites : Will give the number and name of received event invites
-* Check pokes : Will report the number of received pokes.
+* Update status : Every time the gadget is started it will make a new post on your Wall.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.po 2009-10-28 08:42:50 UTC (rev 5774)
@@ -1,16 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
msgid "Facebook Plugin"
-msgstr "Plugin facebook"
+msgstr "Plugin Facebook"
msgid "The Facebook plugin will notify you of any updates on your Facebook account."
-msgstr "Le plugin Facebook vous notifiera des updates sur votre compte Facebook"
+msgstr "Le plugin Facebook vous notifiera de chaque mise à jour sur votre compte Facebook."
msgid "Login"
msgstr "Login"
-msgid "your login"
-msgstr "votre login"
-
msgid "Password"
msgstr "Mot de passe"
@@ -26,77 +33,66 @@
msgid "Check event invites"
msgstr "Vérifier les invitations aux évènements"
-msgid "Check pokes"
-msgstr "Vérifier les pokes"
+msgid "Update user status"
+msgstr "Mettre à jour le status"
-msgid "Run to check your facebook account"
+msgid "Feed to add"
+msgstr "Post à ajouter"
+
+msgid "Hello all from my Tux Droid Facebook gadget"
+msgstr "Bonjour tout le monde depuis mon gadget Facebook Tux Droid"
+
+msgid "Run to check your Facebook account"
msgstr "Démarre pour vérifier votre compte Facebook"
-msgid "Check your facebook account"
-msgstr "Vérifier votre compte Facebook"
+msgid "Check your Facebook account"
+msgstr "Vérifie votre compte Facebook"
+msgid "Configure Tux Droid Facebook permissions"
+msgstr "Configurer les permissions Facebook "
+
msgid "Start every x"
-msgstr "Rapport Facebook en temps réel"
+msgstr "Alerte"
msgid "Start me every x"
-msgstr "M'avertir des changements en temps réel"
+msgstr "Alerte"
-msgid "Start me every x (From full hour)"
-msgstr "Rapport Facebook régulier"
+msgid "Please, allow me to access your Facebook account"
+msgstr "S'il vous plait, autorisez moi à accéder à votre compte Facebook"
-msgid "You have one new message"
-msgstr "Vous avez un nouveau message"
+msgid "I cannot get connected to your facebook account."
+msgstr "Je n'arrive pas à me connecter à votre compte Facebook"
-msgid "You have {0} new messages"
-msgstr "Vous avez {0} nouveaux messages"
+msgid "Your new status was published"
+msgstr "Votre nouveau status à été publié"
-msgid "You have one friend request"
-msgstr "Vous avez une demande d'ami"
+msgid "An error occured trying to set your new status, please, allow me to access your wall"
+msgstr "Une erreur est survenue en tentant de mettre à jour votre nouveau status."
-msgid "You have {0} friend requests"
-msgstr "Vous avez {0} demandes d'amis"
+msgid "You don't have any messages"
+msgstr "Vous n'avez pas de nouveaux messages"
-msgid "From {0}"
-msgstr "De {0}"
+msgid "One message from {0}"
+msgstr "Un message de {0}"
-msgid "You have one group invite"
-msgstr "Vous avez une invitation à rejoindre un groupe"
+msgid "{0} messages from {1}"
+msgstr "{0} messages de {1}"
-msgid "You have {0} group invites"
-msgstr "Vous avez {0} invitations à rejoindre un groupe"
+msgid "{0} requests to be your friend"
+msgstr "{0} vous demande d'être son ami"
-msgid "to {0}"
-msgstr "à {0}"
+msgid "You don't have any friend requests"
+msgstr "Vous n'avez aucune demande d'amis"
-msgid "You have one event invite"
-msgstr "Vous avez une invitation à un évènement"
+msgid "You are invited to this group: {0}"
+msgstr "Vous êtes invité à vous joindre au groupe: {0}"
-msgid "You have {0} event invites"
-msgstr "Vous avez {0} invitations à un évènement"
+msgid "You don't have any group invites"
+msgstr "Vous n'avez aucune invitation de groupe"
-msgid "You have one poke"
-msgstr "Vous avez un poke"
+msgid "You are invited to the event: {0}"
+msgstr "Vous êtes invité à l'évènement: {0}"
-msgid "You have {0} pokes"
-msgstr "Vous avez {0} pokes"
+msgid "You don't have any event invites"
+msgstr "Vous n'êtes invité à aucun évènement"
-msgid "Nothing new on your account"
-msgstr "Pas de nouveau sur votre compte"
-
-msgid "I must be connected to access your facebook account."
-msgstr "Je dois être connecté pour accéder à votre compte Facebook"
-
-msgid "Unknown group"
-msgstr "Groupe sans nom"
-
-msgid "Unknown event"
-msgstr "Evènement sans nom"
-
-msgid "I cannot get connected to your facebook account."
-msgstr "Je n'arrive pas à me connecter à votre compte Facebook"
-
-msgid "Start daily at"
-msgstr "Rapport Facebook quotidien"
-
-msgid "Start me daily"
-msgstr "Me faire un rapport Facebook quotidiennement"
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.wiki
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.wiki 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/fr.wiki 2009-10-28 08:42:50 UTC (rev 5774)
@@ -8,5 +8,5 @@
* Vérifier les invitations comme amis : Vous donnera le nombre de requêtes d'amis dont vous disposez
* Vérifier les invitations aux groupes : Vous donnera le nombre d'invitations aux groupes que l'on vous a envoyées.
* Vérifier les invitations aux évements : Vous donnera le nombres d'invitations à des évènements que l'on vous a envoyées.
-* Vérifier les pokes : Vous donnera le nombre de pokes que l'on vous a envoyés.
+* Mettre à jour le status : Tux Droid mettra à jour votre status Facebook avec le texte donné.
\ No newline at end of file
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.po 2009-10-28 08:42:50 UTC (rev 5774)
@@ -1,101 +1,98 @@
-msgid "Facebook Plugin"
-msgstr "Facebook Plugin"
-
-msgid "The Facebook plugin will notify you of any updates on your Facebook account."
-msgstr "Met de Facebook gadget kan Tux Droid jouw Facebook checken voor updates."
-
-msgid "Login"
-msgstr "Login"
-
-msgid "your login"
-msgstr "uw login"
-
-msgid "Password"
-msgstr "Wachtwoord"
-
-msgid "Check number of messages"
-msgstr "Check aantal berichten"
-
-msgid "Check friend requests"
-msgstr "Check vriendschapsverzoeken"
-
-msgid "Check group invites"
-msgstr "Check groepsuitnodigingen"
-
-msgid "Check event invites"
-msgstr "Check eventuitnodigingen"
-
-msgid "Check pokes"
-msgstr "Check porren"
-
-msgid "Run to check your facebook account"
-msgstr "Start om jouw feesboek account te checken"
-
-msgid "Check your facebook account"
-msgstr "Check jouw feesboek account"
-
-msgid "Start every x"
-msgstr "Check jouw Facebook account automatisch"
-
-msgid "Start me every x"
-msgstr "Check jouw Facebook account automatisch"
-
-msgid "Start me every x (From full hour)"
-msgstr "Give me a Facebook report regularly"
-
-msgid "You have one new message"
-msgstr "Je hebt 1 nieuw bericht"
-
-msgid "You have {0} new messages"
-msgstr "Je hebt {0} nieuwe berichten"
-
-msgid "You have one friend request"
-msgstr "Je hebt 1 vriendschapsverzoek"
-
-msgid "You have {0} friend requests"
-msgstr "Je hebt {0} vriendschapsverzoeken"
-
-msgid "From {0}"
-msgstr "Van {0}"
-
-msgid "You have one group invite"
-msgstr "Je hebt 1 groeps uitnodging"
-
-msgid "You have {0} group invites"
-msgstr "Je hebt {0} groeps uitnodigingen"
-
-msgid "to {0}"
-msgstr "voor {0}"
-
-msgid "You have one event invite"
-msgstr "Je hebt 1 ieventuitnodiging"
-
-msgid "You have {0} event invites"
-msgstr "Je hebt {0} ieventuitnodigingen"
-
-msgid "You have one poke"
-msgstr "Je hebt 1 por"
-
-msgid "You have {0} pokes"
-msgstr "Je hebt {0} porren
-
-msgid "Nothing new on your account"
-msgstr "Geen updates gevonden op je feesboek account"
-
-msgid "I must be connected to access your facebook account."
-msgstr "Ik moet connectie hebben om toegang te krijgen tot je feesboek account."
-
-msgid "Unknown group"
-msgstr "Onbekende groep"
-
-msgid "Unknown event"
-msgstr "Onbekende event"
-
-msgid "I cannot get connected to your facebook account."
-msgstr "Ik kan geen connectie maken met je feesboek account."
-
-msgid "Start daily at"
-msgstr "Daily Facebook report"
-
-msgid "Start me daily"
-msgstr "Give me a daily Facebook report"
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Facebook Plugin"
+msgstr "Facebook Plugin"
+
+msgid "The Facebook plugin will notify you of any updates on your Facebook account."
+msgstr "Met de Facebook gadget kan Tux Droid je Facebook checken voor updates."
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgid "Check number of messages"
+msgstr "Check aantal berichten"
+
+msgid "Check friend requests"
+msgstr "Check vriendschapsverzoeken"
+
+msgid "Check group invites"
+msgstr "Check groepsuitnodigingen"
+
+msgid "Check event invites"
+msgstr "Check eventuitnodigingen"
+
+msgid "Update user status"
+msgstr "Update je status"
+
+msgid "Feed to add"
+msgstr "Statuswijziging tekst"
+
+msgid "Hello all from my Tux Droid Facebook gadget"
+msgstr "Hallo allemaal van mijn Tux Droid Facebook gadget"
+
+msgid "Run to check your Facebook account"
+msgstr "Start om je feesboek account te checken"
+
+msgid "Check your Facebook account"
+msgstr "Check je feesboek account"
+
+msgid "Configure Tux Droid Facebook permissions"
+msgstr "Configureer Tux Droid feesboek permissies"
+
+msgid "Start every x"
+msgstr "Check je Facebook account automatisch"
+
+msgid "Start me every x"
+msgstr "Check je Facebook account automatisch"
+
+msgid "Please, allow me to access your Facebook account"
+msgstr "Kan je me toegang geven tot je feesbook account?"
+
+msgid "I cannot get connected to your facebook account."
+msgstr "Ik kan geen connectie maken met je feesboek account."
+
+msgid "Your new status was published"
+msgstr "Je nieuwe status werd toegevoegd."
+
+msgid "An error occured trying to set your new status, please, allow me to access your wall"
+msgstr "Er is een fout opgetreden bij het plaatsen van je nieuwe status. Gelieve me toegang te geven tot je prikbord."
+
+msgid "You don't have any messages"
+msgstr "Je hebt geen nieuwe berichten"
+
+msgid "One message from {0}"
+msgstr "1 bericht van {0}"
+
+msgid "{0} messages from {1}"
+msgstr "{0} berichten van {1}"
+
+msgid "{0} requests to be your friend"
+msgstr "{0} wil je vriend worden"
+
+msgid "You don't have any friend requests"
+msgstr "Je heb geen nieuwe vriendschapsverzoeken"
+
+msgid "You are invited to this group: {0}"
+msgstr "Je bent uitgenodigd tot deze groep : {0}"
+
+msgid "You don't have any group invites"
+msgstr "Je hebt geen groepsuitnodigingen"
+
+msgid "You are invited to the event: {0}"
+msgstr "Je bent uitgenodigd op dit evenement : {0}"
+
+msgid "You don't have any event invites"
+msgstr "Je hebt geen evenementsuitnodigingen"
+
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.wiki
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.wiki 2009-10-26 14:59:02 UTC (rev 5773)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/nl.wiki 2009-10-28 08:42:50 UTC (rev 5774)
@@ -1,11 +1,11 @@
-== Synopsis ==
-Met de Facebook plugin kan Tux Droid jouw Facebook account checken voor updates.
-Voor meer informatie over Facebook, surf naar http://www.facebook.com
-
-== Beschikbare functies ==
-
-* Check aantal berichten : Zal het aantal binnengekomen privéberichten checken
-* Check vriendschapsverzoeken : Zal het aantal vriendschapsverzoeken opvragen en de naam weergeven
-* Check groepsuitnodigingen : Zal het aantal en de naam van de binnengekomen groepsuitnodigingen weergeven
-* Check eventuitnodigingen : Zal het aantal en de de naam van uitnodiging voor een event weergeven
-* Check porren : Zal het aantal ontvangen porren weergeven.
+== Synopsis ==
+Met de Facebook plugin kan Tux Droid je Facebook account checken voor updates.
+Voor meer informatie over Facebook, surf naar http://www.facebook.com
+
+== Beschikbare functies ==
+
+* Check aantal berichten : Zal het aantal binnengekomen privéberichten checken
+* Check vriendschapsverzoeken : Zal het aantal vriendschapsverzoeken opvragen en de naam weergeven
+* Check groepsuitnodigingen : Zal het aantal en de naam van de binnengekomen groepsuitnodigingen weergeven
+* Check eventuitnodigingen : Zal het aantal en de de naam van uitnodiging voor een event weergeven
+* Update je status : Voeg een statuswijziging toe op je Facebook pagina.
|
|
From: jerome <c2m...@c2...> - 2009-10-26 14:59:13
|
Author: jerome Date: 2009-10-26 15:59:02 +0100 (Mon, 26 Oct 2009) New Revision: 5773 Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot Log: * Fixed doubled msgid. Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot 2009-10-26 14:50:04 UTC (rev 5772) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot 2009-10-26 14:59:02 UTC (rev 5773) @@ -58,12 +58,6 @@ msgid "An error occured trying to set your new status, please, allow me to access your wall" msgstr "" -msgid "Please, allow me to access your Facebook account" -msgstr "" - -msgid "Please, allow me to access your Facebook account" -msgstr "" - msgid "You don't have any messages" msgstr "" |
|
From: jerome <c2m...@c2...> - 2009-10-26 14:50:26
|
Author: jerome
Date: 2009-10-26 15:50:04 +0100 (Mon, 26 Oct 2009)
New Revision: 5772
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml
Log:
* Updated po template.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot 2009-10-26 14:39:31 UTC (rev 5771)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.pot 2009-10-26 14:50:04 UTC (rev 5772)
@@ -7,9 +7,6 @@
msgid "Login"
msgstr ""
-msgid "your login"
-msgstr ""
-
msgid "Password"
msgstr ""
@@ -25,77 +22,71 @@
msgid "Check event invites"
msgstr ""
-msgid "Check pokes"
+msgid "Update user status"
msgstr ""
-msgid "Run to check your facebook account"
+msgid "Feed to add"
msgstr ""
-msgid "Check your facebook account"
+msgid "Hello all from my Tux Droid Facebook gadget"
msgstr ""
-msgid "Start every x"
+msgid "Run to check your Facebook account"
msgstr ""
-msgid "Start me every x"
+msgid "Check your Facebook account"
msgstr ""
-msgid "Start me every x (From full hour)"
+msgid "Configure Tux Droid Facebook permissions"
msgstr ""
-msgid "You have one new message"
+msgid "Start every x"
msgstr ""
-msgid "You have {0} new messages"
+msgid "Start me every x"
msgstr ""
-msgid "You have one friend request"
+msgid "Please, allow me to access your Facebook account"
msgstr ""
-msgid "You have {0} friend requests"
+msgid "I cannot get connected to your facebook account."
msgstr ""
-msgid "From {0}"
+msgid "Your new status was published"
msgstr ""
-msgid "You have one group invite"
+msgid "An error occured trying to set your new status, please, allow me to access your wall"
msgstr ""
-msgid "You have {0} group invites"
+msgid "Please, allow me to access your Facebook account"
msgstr ""
-msgid "to {0}"
+msgid "Please, allow me to access your Facebook account"
msgstr ""
-msgid "You have one event invite"
+msgid "You don't have any messages"
msgstr ""
-msgid "You have {0} event invites"
+msgid "One message from {0}"
msgstr ""
-msgid "You have one poke"
+msgid "{0} messages from {1}"
msgstr ""
-msgid "You have {0} pokes"
+msgid "{0} requests to be your friend"
msgstr ""
-msgid "Nothing new on your account"
+msgid "You don't have any friend requests"
msgstr ""
-msgid "I must be connected to access your facebook account."
+msgid "You are invited to this group: {0}"
msgstr ""
-msgid "Unknown group"
+msgid "You don't have any group invites"
msgstr ""
-msgid "Unknown event"
+msgid "You are invited to the event: {0}"
msgstr ""
-msgid "I cannot get connected to your facebook account."
+msgid "You don't have any event invites"
msgstr ""
-
-msgid "Start daily at"
-msgstr ""
-
-msgid "Start me daily"
-msgstr ""
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml 2009-10-26 14:39:31 UTC (rev 5771)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml 2009-10-26 14:50:04 UTC (rev 5772)
@@ -67,13 +67,13 @@
<commands>
<command
name="run"
- description="Run to check your facebook account" />
+ description="Run to check your Facebook account" />
<command
name="check"
- description="Check your facebook account" />
+ description="Check your Facebook account" />
<command
name="configure"
- description="Configure Tux Droid facebook application permissions" />
+ description="Configure Tux Droid Facebook permissions" />
</commands>
<tasks>
<task
|
|
From: jerome <c2m...@c2...> - 2009-10-26 14:39:50
|
Author: jerome
Date: 2009-10-26 15:39:31 +0100 (Mon, 26 Oct 2009)
New Revision: 5771
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Updated strings.
* Changed a var name.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-26 13:51:29 UTC (rev 5770)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-26 14:39:31 UTC (rev 5771)
@@ -35,7 +35,7 @@
public class FacebookPlugin extends SimplePlugin<PluginFacebookConfiguration>{
private boolean check = false;
- private boolean throwed = false;
+ private boolean thrown = false;
private boolean secondCycle = false;
@@ -48,9 +48,9 @@
*/
private void throwRes()
{
- if(this.check && (!throwed))
+ if(this.check && (!thrown))
{
- throwed = true;
+ thrown = true;
this.throwResult(true);
this.throwMessage("Facebook");
}
@@ -85,7 +85,7 @@
public void doConfigure(FacebookFunctions funct)
{
//Prompt web browser for facebook permissions.
- this.throwMessage("Please, allow me to access you Facebook account");
+ this.throwMessage("Please, allow me to access your Facebook account");
FacebookConnection.promptAuthorizations();
System.exit( 0 );
}
@@ -137,7 +137,7 @@
this.throwEventInvites();
}
- if(( !this.throwed ) && this.getCommand().equalsIgnoreCase("check") )
+ if(( !this.thrown ) && this.getCommand().equalsIgnoreCase("check") )
{
this.throwResult(false);
}
@@ -172,7 +172,7 @@
}
else
{
- this.throwMessage("An error occured trying to set your new status, please, allow me to acces your wall");
+ this.throwMessage("An error occured trying to set your new status, please, allow me to access your wall");
doConfigure(functions);
}
}
@@ -180,7 +180,7 @@
{
if( ! this.getCommand().equalsIgnoreCase("check"))
{
- this.throwMessage("Please, allo me to access your Facebook account");
+ this.throwMessage("Please, allow me to access your Facebook account");
}
System.exit(0);
}
@@ -202,7 +202,7 @@
{
if(this.getCommand().equalsIgnoreCase("check"))
{
- this.throwMessage("Please, allo me to access your Facebook account");
+ this.throwMessage("Please, allow me to access your Facebook account");
}
System.exit(0);
}
@@ -282,7 +282,7 @@
{
if(this.getCommand().equalsIgnoreCase("check"))
{
- this.throwMessage("Please, allo me to access your Facebook account");
+ this.throwMessage("Please, allow me to access your Facebook account");
}
System.exit(0);
}
@@ -299,7 +299,7 @@
//Only throwing in the second cycle of check command or run.
if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
{
- this.throwMessage("{0} request to be your friend", request);
+ this.throwMessage("{0} requests to be your friend", request);
said = true;
}
}
@@ -344,7 +344,7 @@
//Only throwing in the second cycle of check command or run.
if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
{
- this.throwMessage("You are invited to the following group: {0}", group);
+ this.throwMessage("You are invited to this group: {0}", group);
said = true;
}
}
@@ -388,7 +388,7 @@
//Only throwing in the second cycle of check command or run.
if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
{
- this.throwMessage("You are invited to the following event: {0}", event);
+ this.throwMessage("You are invited to the event: {0}", event);
said = true;
}
}
|
|
From: jerome <c2m...@c2...> - 2009-10-26 13:51:40
|
Author: jerome Date: 2009-10-26 14:51:29 +0100 (Mon, 26 Oct 2009) New Revision: 5770 Added: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookPromptException.java Log: * Forget to add new error class. Added: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookPromptException.java =================================================================== --- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookPromptException.java (rev 0) +++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookPromptException.java 2009-10-26 13:51:29 UTC (rev 5770) @@ -0,0 +1,32 @@ +/* This file is part of "TuxDroid plugin Facebook". + * Copyright 2009, kysoh + * Author : Conan Jerome. + * eMail : jer...@ky... + * Site : http://www.kysoh.com/ + * + * "TuxDroid plugin Facebook" is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * "TuxDroid plugin Facebook" is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with "TuxDroid plugin Facebook"; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package com.kysoh.plugins.facebook.connection; + +public class FacebookPromptException extends Exception{ + + /** + * This class handle facebook exception prompt. + */ + private static final long serialVersionUID = 1L; + +} |
|
From: jerome <c2m...@c2...> - 2009-10-26 13:50:53
|
Author: jerome
Date: 2009-10-26 14:50:35 +0100 (Mon, 26 Oct 2009)
New Revision: 5769
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
Log:
* Fixed autho prompt bug.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-26 11:12:45 UTC (rev 5768)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-26 13:50:35 UTC (rev 5769)
@@ -22,7 +22,6 @@
package com.kysoh.plugins.facebook;
-
import java.util.Collections;
import java.util.Hashtable;
import java.util.Iterator;
@@ -34,6 +33,8 @@
import com.google.code.facebookapi.FacebookException;
import com.google.code.facebookapi.FacebookJsonRestClient;
+import com.google.code.facebookapi.Permission;
+import com.kysoh.plugins.facebook.connection.FacebookPromptException;
public class FacebookFunctions {
@@ -68,12 +69,20 @@
/**
* Add requested feed to the user wall.
*/
- public boolean publishFeed(String aFeed)
+ public boolean publishFeed(String aFeed) throws FacebookPromptException
{
try
{
- client.users_setStatus(aFeed);
- return true;
+ if(! client.users_hasAppPermission(Permission.STATUS_UPDATE))
+ {
+ FacebookConnection.promptAuthorizations();
+ throw(new FacebookPromptException());
+ }
+ else
+ {
+ client.users_setStatus(aFeed);
+ return true;
+ }
}
catch (FacebookException e)
{
@@ -86,7 +95,7 @@
/**
* Return email notifications.
*/
- public Hashtable<String, Vector<String>> getEmailNotifications()
+ public Hashtable<String, Vector<String>> getEmailNotifications() throws FacebookPromptException
{
Hashtable<String, Vector<String>> result = new Hashtable<String, Vector<String>>();
@@ -127,7 +136,9 @@
}
catch (FacebookException e)
{
- ;
+ e.printStackTrace();
+ FacebookConnection.promptAuthorizations();
+ throw(new FacebookPromptException());
}
catch (JSONException e)
{
@@ -146,7 +157,7 @@
* Return friend names of friend requests.
* @return
*/
- public Vector<String> getFriendRequests()
+ public Vector<String> getFriendRequests() throws FacebookPromptException
{
Vector<String> result = new Vector<String>();
@@ -174,7 +185,8 @@
}
catch (FacebookException e)
{
- ;
+ FacebookConnection.promptAuthorizations();
+ throw(new FacebookPromptException());
}
catch (JSONException e)
{
@@ -425,26 +437,4 @@
return result;
}
-
-
- /**
- * Return true if our plugin has fb rights.
- * @return
- */
- public boolean apiGrantedFullAcess()
- {
- //Trying to read mailbox that is the most important right to have.
- String query = "SELECT thread_id FROM thread WHERE folder_id = 0";
- try
- {
- client.fql_query(query);
- return true;
- }
- catch (FacebookException e)
- {
- e.printStackTrace();
- //Return false in case of exception, prompt auth was never started.
- return false;
- }
- }
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-26 11:12:45 UTC (rev 5768)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-26 13:50:35 UTC (rev 5769)
@@ -28,6 +28,7 @@
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
import com.kysoh.plugins.facebook.configuration.FacebookDatasStruct;
import com.kysoh.plugins.facebook.configuration.PluginFacebookConfiguration;
+import com.kysoh.plugins.facebook.connection.FacebookPromptException;
import com.kysoh.plugins.facebook.FacebookConnection;
@@ -83,14 +84,10 @@
*/
public void doConfigure(FacebookFunctions funct)
{
- //Adding publish stream auth if needed.
- if (!functions.apiGrantedFullAcess())
- {
- //Prompt web browser for facebook permissions.
- this.throwMessage("Please, allow me to access you Facebook account");
- FacebookConnection.promptAuthorizations();
- System.exit( 0 );
- }
+ //Prompt web browser for facebook permissions.
+ this.throwMessage("Please, allow me to access you Facebook account");
+ FacebookConnection.promptAuthorizations();
+ System.exit( 0 );
}
@@ -110,12 +107,6 @@
facebookHistory = new FacebookDatasStruct(this.configuration().getLogin());
secondCycle = ( this.getCommand().equalsIgnoreCase("check") && facebookHistory.isFirstCycle() ) ? false : true;
- //Checking auth.
- if(this.getCommand().equalsIgnoreCase("run"))
- {
- this.doConfigure(functions);
- }
-
//Updating user status.
if(this.configuration().getUpdateStatus())
{
@@ -173,14 +164,25 @@
private void updateStatus()
{
//Updating user status.
- if(functions.publishFeed(this.configuration().getStatusText()))
+ try
{
- this.throwMessage("Your new status was published");
- }
- else
+ if(functions.publishFeed(this.configuration().getStatusText()))
+ {
+ this.throwMessage("Your new status was published");
+ }
+ else
+ {
+ this.throwMessage("An error occured trying to set your new status, please, allow me to acces your wall");
+ doConfigure(functions);
+ }
+ }
+ catch (FacebookPromptException e)
{
- this.throwMessage("An error occured trying to set your new status, please, allow me to acces your wall");
- doConfigure(functions);
+ if( ! this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("Please, allo me to access your Facebook account");
+ }
+ System.exit(0);
}
}
@@ -192,7 +194,18 @@
{
//Fetching mails.
Hashtable<String, Vector<String>> inbox = new Hashtable<String, Vector<String>>();
- inbox = functions.getEmailNotifications();
+ try
+ {
+ inbox = functions.getEmailNotifications();
+ }
+ catch (FacebookPromptException e)
+ {
+ if(this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("Please, allo me to access your Facebook account");
+ }
+ System.exit(0);
+ }
Vector<String> keys = new Vector<String>(inbox.keySet());
//Will contain all messages id's that must be added to the history.
@@ -261,7 +274,18 @@
{
boolean said = false;
Vector<String> f_requests = new Vector<String>();
- f_requests = functions.getFriendRequests();
+ try
+ {
+ f_requests = functions.getFriendRequests();
+ }
+ catch (FacebookPromptException e)
+ {
+ if(this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("Please, allo me to access your Facebook account");
+ }
+ System.exit(0);
+ }
if (f_requests.size() > 0)
{
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java 2009-10-26 11:12:45 UTC (rev 5768)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java 2009-10-26 13:50:35 UTC (rev 5769)
@@ -67,12 +67,14 @@
public static void setMail(String eMail)
{
mail = eMail;
+ sessionUtils.add(eMail);
}
public static void setPass(String aPass)
{
- pass = aPass;
+ pass = aPass;
+ sessionUtils.add(aPass);
}
@@ -135,7 +137,7 @@
*/
public static String getMail()
{
- return sessionUtils.get( 2 );
+ return (String) sessionUtils.get( 2 );
}
@@ -145,7 +147,7 @@
*/
public static String getPass()
{
- return sessionUtils.get( 3 );
+ return (String) sessionUtils.get( 3 );
}
@@ -178,11 +180,11 @@
try
{
File path = new File("");
- File session = new File( path.getAbsolutePath() + File.separator + "session");
+ File session = new File( path.getAbsolutePath() + File.separator + "session_" + mail);
if(session.isFile())
{
- FileInputStream fichier = new FileInputStream("session");
+ FileInputStream fichier = new FileInputStream("session_" + mail);
ObjectInputStream ois = new ObjectInputStream(fichier);
sessionUtils = (SerializedVector) ois.readObject();
}
@@ -191,6 +193,8 @@
sessionUtils = new SerializedVector();
sessionUtils.add("0");
sessionUtils.add("0");
+ sessionUtils.add(mail);
+ sessionUtils.add(pass);
}
}
catch (java.io.IOException e)
@@ -218,7 +222,7 @@
try
{
File path = new File("");
- File session = new File( path.getAbsolutePath() + File.separator + "session");
+ File session = new File( path.getAbsolutePath() + File.separator + "session_" + mail);
FileOutputStream file = new FileOutputStream(session.getAbsolutePath());
ObjectOutputStream oos = new ObjectOutputStream(file);
oos.writeObject(sessionUtils);
|
|
From: remi <c2m...@c2...> - 2009-10-26 11:13:08
|
Author: remi
Date: 2009-10-26 12:12:45 +0100 (Mon, 26 Oct 2009)
New Revision: 5768
Modified:
software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
Log:
* Fixed error in method name
Modified: software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-10-23 14:48:13 UTC (rev 5767)
+++ software_suite_v3/smart-core/smart-server/trunk/util/applicationserver/plugin/Plugin.py 2009-10-26 11:12:45 UTC (rev 5768)
@@ -200,7 +200,7 @@
data['description']['author'] = description.getAuthor()
data['description']['description'] = description.getDescription(language)
data['description']['platform'] = description.getPlatform()
- data['description']['hasAttituneAlert'] = description.hasAlertAttitune()
+ data['description']['hasAttituneAlert'] = description.hasAttituneAlert()
try:
f = open(description.getHelpFile(language), "rb")
try:
|
|
From: jerome <c2m...@c2...> - 2009-10-23 14:48:29
|
Author: jerome
Date: 2009-10-23 16:48:13 +0200 (Fri, 23 Oct 2009)
New Revision: 5767
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
Log:
* Fixed a bug with the session when a new user get logged in.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-23 14:28:44 UTC (rev 5766)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-23 14:48:13 UTC (rev 5767)
@@ -37,11 +37,22 @@
/**
* Try to get connected to fb with the old registered session.
*/
- private boolean connectOldSession()
+ private boolean connectOldSession(String username, String password)
{
try
{
FacebookSessionUtils.loadSession();
+
+ //Checking username.
+ if(! username.equalsIgnoreCase(FacebookSessionUtils.getMail()))
+ {
+ if(! password.equalsIgnoreCase(FacebookSessionUtils.getPass()))
+ {
+ //then a new user has logged in.
+ return false;
+ }
+ }
+
String sessionKey = FacebookSessionUtils.getSessionKey();
String sessionSecret = FacebookSessionUtils.getSessionSecret();
@@ -73,7 +84,7 @@
try
{
//Returning if old session was still valid.
- if(this.connectOldSession())
+ if(this.connectOldSession(username, password))
{
return true;
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java 2009-10-23 14:28:44 UTC (rev 5766)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java 2009-10-23 14:48:13 UTC (rev 5767)
@@ -60,6 +60,8 @@
{
sessionUtils.add("0");
sessionUtils.add("1");
+ sessionUtils.add(mail);
+ sessionUtils.add(pass);
}
public static void setMail(String eMail)
@@ -126,7 +128,28 @@
}
+
/**
+ * Return last used mail.
+ * @return
+ */
+ public static String getMail()
+ {
+ return sessionUtils.get( 2 );
+ }
+
+
+ /**
+ * Return last used pass.
+ * @return
+ */
+ public static String getPass()
+ {
+ return sessionUtils.get( 3 );
+ }
+
+
+ /**
* Register the last known session key.
* @param aSessionKey
*/
|
|
From: jerome <c2m...@c2...> - 2009-10-23 14:29:04
|
Author: jerome
Date: 2009-10-23 16:28:44 +0200 (Fri, 23 Oct 2009)
New Revision: 5766
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Fixed a dummy bug.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-23 13:38:08 UTC (rev 5765)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-23 14:28:44 UTC (rev 5766)
@@ -442,6 +442,7 @@
}
catch (FacebookException e)
{
+ e.printStackTrace();
//Return false in case of exception, prompt auth was never started.
return false;
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-23 13:38:08 UTC (rev 5765)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-23 14:28:44 UTC (rev 5766)
@@ -238,7 +238,7 @@
}
else
{
- this.throwMessage("{0} messages from {1}", sender, emailsBySender.get(sender));
+ this.throwMessage("{0} messages from {1}", emailsBySender.get(sender), sender);
}
}
}
|
|
From: jerome <c2m...@c2...> - 2009-10-23 14:05:08
|
Author: jerome
Date: 2009-10-23 15:38:08 +0200 (Fri, 23 Oct 2009)
New Revision: 5765
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java
Log:
* Forget to add first cycle stuff.
* Imroved auto auth prompt.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml 2009-10-23 12:06:17 UTC (rev 5764)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml 2009-10-23 13:38:08 UTC (rev 5765)
@@ -85,54 +85,12 @@
weekMask="true,true,true,true,true,true,true"
weekMaskType="weekpart"
- weekMaskVisible="true"
+ weekMaskVisible="false"
- delay="00:01:00"
+ delay="00:05:00"
delayMask="true,true,true"
delayVisible="false"
/>
- <task
- name="Start every x from full hour"
- description="Start me every x (From full hour)"
- command="check"
- type="every x from full hour"
- activated="false"
-
- weekMask="true,true,true,true,true,true,true"
- weekMaskType="weekpart"
- weekMaskVisible="true"
-
- date="0000/00/00"
- dateVisible="false"
-
- hoursBegin="00:00:00"
- hoursBeginMask="true,true,true"
- hoursBeginVisible="false"
-
- hoursEnd="23:59:00"
- hoursEndMask="true,true,true"
- hoursEndVisible="false"
-
- delay="00:15:00"
- delayType="quarters"
- delayMask="true,true,false"
- delayVisible="true"
- />
- <task
- name="Start daily at"
- description="Start me daily"
- command="check"
- type="daily at"
- activated="false"
-
- weekMask="true,true,true,true,true,true,true"
- weekMaskType="weekpart"
- weekMaskVisible="true"
-
- hoursBegin="07:00:00"
- hoursBeginMask="true,true,false"
- hoursBeginVisible="true"
- />
</tasks>
</plugin>
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-23 12:06:17 UTC (rev 5764)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-23 13:38:08 UTC (rev 5765)
@@ -23,7 +23,6 @@
package com.kysoh.plugins.facebook;
import java.io.IOException;
-import java.util.List;
import com.google.code.facebookapi.FacebookException;
import com.google.code.facebookapi.FacebookJsonRestClient;
@@ -34,11 +33,7 @@
private FacebookJsonRestClient client;
- //Auth options.
- public static final byte AUTH_PUBLISH_FEEDS = 0;
- public static final byte AUTH_READ_MAILBOX = 1;
-
/**
* Try to get connected to fb with the old registered session.
*/
@@ -146,28 +141,15 @@
/**
* Prompt for plugin facebook authorizations.
*/
- public static void promptAuthorizations(List<Byte> options)
+ public static void promptAuthorizations()
{
- //Adding default.
- String rights = "read_stream,offline_access";
-
- if(options.contains(FacebookConnection.AUTH_PUBLISH_FEEDS))
- {
- rights += "," + "read_mailbox";
- }
-
- if(options.contains(FacebookConnection.AUTH_READ_MAILBOX))
- {
- rights += "," + "publish_stream";
- }
-
- String url = "http://www.facebook.com/login.php?api_key=+" +
+ String url = "http://www.facebook.com/login.php?api_key=" +
FacebookSessionUtils.api_key +
"&connect_display=popup&v=1.0" +
"&next=http://www.facebook.com/connect/login_success.html" +
"&cancel_url=http://www.facebook.com/connect/login_failure.html" +
"&fbconnect=true&return_session=true" +
- "&req_perms=" + rights;
+ "&req_perms=read_stream,offline_access,read_mailbox,publish_stream";
BareBonesBrowserLaunch.openURL(url);
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-23 12:06:17 UTC (rev 5764)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-23 13:38:08 UTC (rev 5765)
@@ -425,4 +425,25 @@
return result;
}
+
+
+ /**
+ * Return true if our plugin has fb rights.
+ * @return
+ */
+ public boolean apiGrantedFullAcess()
+ {
+ //Trying to read mailbox that is the most important right to have.
+ String query = "SELECT thread_id FROM thread WHERE folder_id = 0";
+ try
+ {
+ client.fql_query(query);
+ return true;
+ }
+ catch (FacebookException e)
+ {
+ //Return false in case of exception, prompt auth was never started.
+ return false;
+ }
+ }
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-23 12:06:17 UTC (rev 5764)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-23 13:38:08 UTC (rev 5765)
@@ -22,10 +22,7 @@
package com.kysoh.plugins.facebook;
-
-import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.List;
import java.util.Vector;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
@@ -39,6 +36,9 @@
private boolean check = false;
private boolean throwed = false;
+
+ private boolean secondCycle = false;
+
private FacebookFunctions functions;
private FacebookDatasStruct facebookHistory;
@@ -51,6 +51,7 @@
{
throwed = true;
this.throwResult(true);
+ this.throwMessage("Facebook");
}
}
@@ -62,7 +63,12 @@
{
if (this.getCommand().equalsIgnoreCase("configure"))
{
- this.doConfigure();
+ FacebookConnection facebook = new FacebookConnection();
+ if ( facebook.Connect(this.configuration().getLogin(), this.configuration().getPassword()) )
+ {
+ functions = new FacebookFunctions(facebook.getClient());
+ this.doConfigure(functions);
+ }
}
else
{
@@ -75,24 +81,16 @@
/**
* Configure facebook account access rights.
*/
- public void doConfigure()
- {
- List<Byte> options = new ArrayList<Byte>();
-
+ public void doConfigure(FacebookFunctions funct)
+ {
//Adding publish stream auth if needed.
- if(this.configuration().getUpdateStatus())
+ if (!functions.apiGrantedFullAcess())
{
- options.add(FacebookConnection.AUTH_PUBLISH_FEEDS);
+ //Prompt web browser for facebook permissions.
+ this.throwMessage("Please, allow me to access you Facebook account");
+ FacebookConnection.promptAuthorizations();
+ System.exit( 0 );
}
-
- //Adding read mailbox auth if needed.
- if(this.configuration().getNotifyEmail())
- {
- options.add(FacebookConnection.AUTH_READ_MAILBOX);
- }
-
- //Prompt web browser for facebook permissions.
- FacebookConnection.promptAuthorizations(options);
}
@@ -110,7 +108,14 @@
//History object.
facebookHistory = new FacebookDatasStruct(this.configuration().getLogin());
+ secondCycle = ( this.getCommand().equalsIgnoreCase("check") && facebookHistory.isFirstCycle() ) ? false : true;
+ //Checking auth.
+ if(this.getCommand().equalsIgnoreCase("run"))
+ {
+ this.doConfigure(functions);
+ }
+
//Updating user status.
if(this.configuration().getUpdateStatus())
{
@@ -174,7 +179,8 @@
}
else
{
- this.throwMessage("An error occured trying to set your new status, please, try again later");
+ this.throwMessage("An error occured trying to set your new status, please, allow me to acces your wall");
+ doConfigure(functions);
}
}
@@ -223,16 +229,18 @@
for(String sender : senders)
{
-
- throwRes();
- if (emailsBySender.get(sender).intValue() == 1)
+ if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
{
- this.throwMessage("One message from {0}", sender);
+ throwRes();
+ if (emailsBySender.get(sender).intValue() == 1)
+ {
+ this.throwMessage("One message from {0}", sender);
+ }
+ else
+ {
+ this.throwMessage("{0} messages from {1}", sender, emailsBySender.get(sender));
+ }
}
- else
- {
- this.throwMessage("{0} messages from {1}", sender, emailsBySender.get(sender));
- }
}
//Registering history.
@@ -264,8 +272,12 @@
{
throwRes();
this.facebookHistory.addFriendRequest(fid);
- this.throwMessage("{0} request to be your friend", request);
- said = true;
+ //Only throwing in the second cycle of check command or run.
+ if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
+ {
+ this.throwMessage("{0} request to be your friend", request);
+ said = true;
+ }
}
}
this.facebookHistory.registerStruct();
@@ -305,8 +317,12 @@
{
throwRes();
this.facebookHistory.addGroupInvite(gid);
- this.throwMessage("You are invited to the following group: {0}", group);
- said = true;
+ //Only throwing in the second cycle of check command or run.
+ if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
+ {
+ this.throwMessage("You are invited to the following group: {0}", group);
+ said = true;
+ }
}
}
@@ -345,8 +361,12 @@
{
throwRes();
this.facebookHistory.addEventInvite(functions.getEventID(event));
- this.throwMessage("You are invited to the following event: {0}", event);
- said = true;
+ //Only throwing in the second cycle of check command or run.
+ if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
+ {
+ this.throwMessage("You are invited to the following event: {0}", event);
+ said = true;
+ }
}
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java 2009-10-23 12:06:17 UTC (rev 5764)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java 2009-10-23 13:38:08 UTC (rev 5765)
@@ -30,7 +30,10 @@
openURL.invoke(null, new Object[] {url});
}
else if (osName.startsWith("Windows"))
- Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+ {
+ Process p = Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+ p.waitFor();
+ }
else
{ //assume Unix or Linux
String[] browsers = {
|
|
From: jerome <c2m...@c2...> - 2009-10-23 12:06:40
|
Author: jerome
Date: 2009-10-23 14:06:17 +0200 (Fri, 23 Oct 2009)
New Revision: 5764
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
Log:
* Improved history system.
* Fixed a bug with history id's.
* Fixed a bug when the plugin was requesting too many logins. FB plugin now works with login / sessions.
* Implemented 'Store session' function to store the last known session.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-22 06:28:16 UTC (rev 5763)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-23 12:06:17 UTC (rev 5764)
@@ -39,6 +39,35 @@
public static final byte AUTH_READ_MAILBOX = 1;
+ /**
+ * Try to get connected to fb with the old registered session.
+ */
+ private boolean connectOldSession()
+ {
+ try
+ {
+ FacebookSessionUtils.loadSession();
+ String sessionKey = FacebookSessionUtils.getSessionKey();
+ String sessionSecret = FacebookSessionUtils.getSessionSecret();
+
+ if(sessionKey.equals("0") || sessionSecret.equals("0"))
+ {
+ return false;
+ }
+
+ client = new FacebookJsonRestClient(FacebookSessionUtils.api_key, sessionSecret, sessionKey);
+ client.users_getLoggedInUser();
+ return true;
+ }
+ catch (FacebookException e)
+ {
+ ;
+ }
+ return false;
+ }
+
+
+
public boolean Connect(String username, String password)
{
FacebookSessionUtils.setMail(username);
@@ -48,11 +77,19 @@
try
{
-
+ //Returning if old session was still valid.
+ if(this.connectOldSession())
+ {
+ return true;
+ }
+
+ FacebookSessionUtils.loadSession();
String sessionKey = FacebookSessionUtils.getValidSessionID( true );
+ FacebookSessionUtils.registerSessionKey(sessionKey);
//Generate session secret, ready to pass to desktop app client
String sessionSecret = FacebookSessionUtils.lastClientUsed.getCacheSessionSecret();
+ FacebookSessionUtils.registerSessionSecret(sessionSecret);
client = new FacebookJsonRestClient(FacebookSessionUtils.api_key, sessionSecret, sessionKey);
@@ -61,15 +98,17 @@
return false;
}
+ FacebookSessionUtils.registerSession();
+
return true;
}
catch (FacebookException e)
{
- e.printStackTrace();
+ //e.printStackTrace();
}
catch (IOException e)
{
- e.printStackTrace();
+ //e.printStackTrace();
}
return false;
@@ -88,7 +127,6 @@
}
catch (FacebookException e)
{
- // TODO Auto-generated catch block
e.printStackTrace();
}
return null;
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-22 06:28:16 UTC (rev 5763)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-23 12:06:17 UTC (rev 5764)
@@ -34,7 +34,6 @@
import com.google.code.facebookapi.FacebookException;
import com.google.code.facebookapi.FacebookJsonRestClient;
-import com.kysoh.plugins.facebook.connection.FacebookSessionUtils;
public class FacebookFunctions {
@@ -42,6 +41,10 @@
private FacebookJsonRestClient client;
private JSONObject notifications = null;
+ private Hashtable<String, String> events_id = new Hashtable<String, String>();
+ private Hashtable<String, String> groups_id = new Hashtable<String, String>();
+ private Hashtable<String, String> friends_id = new Hashtable<String, String>();
+
/**
* Class constructor.
* @param connection
@@ -165,6 +168,7 @@
name = ((JSONArray) client.fql_query(query_name + user_id)).getJSONObject( 0 ).getString("name");
result.add(name);
+ this.friends_id.put(name, user_id);
}
}
@@ -209,7 +213,8 @@
group_id = String.valueOf(groups.get( x ));
name = ((JSONArray) client.fql_query(query_name + group_id)).getJSONObject( 0 ).getString("name");
- result.add(name);
+ result.add(name);
+ this.groups_id.put(name, group_id);
}
}
@@ -255,7 +260,9 @@
event_id = String.valueOf(events.get( x ));
name = ((JSONArray) client.fql_query(query_name + event_id)).getJSONObject( 0 ).getString("name");
- result.add(name);
+ result.add(name);
+ //Registering event datas into hashtable.
+ this.events_id.put(name, event_id);
}
}
@@ -275,8 +282,54 @@
}
+ /**
+ * Return the event id from its name.
+ * @param event_names
+ * @return the event id of an event name.
+ */
+ public String getEventID(String event_name)
+ {
+ if(this.events_id.containsKey(event_name))
+ {
+ return this.events_id.get(event_name);
+ }
+ return String.valueOf(0);
+ }
+
/**
+ * Return the group invite id from its name.
+ * @param group_name
+ * @return
+ */
+ public String getGroupID(String group_name)
+ {
+ if(this.groups_id.containsKey(group_name))
+ {
+ return this.groups_id.get(group_name);
+ }
+ return String.valueOf(0);
+ }
+
+
+
+ /**
+ * Return a friend id based on his name.
+ * @param friend_name
+ * @return
+ */
+ public String getFriendRequestID(String friend_name)
+ {
+ if(this.friends_id.containsKey(friend_name))
+ {
+ return this.friends_id.get(friend_name);
+ }
+ return String.valueOf(0);
+ }
+
+
+
+ /**
* Return a Facebook name for the given uid.
* @param uid
* @return
@@ -349,7 +402,7 @@
Iterator<String> it = baseHash.keySet().iterator();
- //Gettin all senders ( subject and message id are only for history stuff ).
+ //Getting all senders ( subject and message id are only for history stuff ).
while(it.hasNext())
{
senders.add(baseHash.get(it.next()).get(1));
@@ -372,25 +425,4 @@
return result;
}
-
-
- /**
- * Return the current fb rights for the plugin.
- * @return
- */
- public Vector<String> getCurrentFBAuth()
- {
- Vector<String> rights = new Vector<String>();
-
- try
- {
- System.out.println(client.permissions_checkAvailableApiAccess(FacebookSessionUtils.api_key));
- }
- catch (FacebookException e)
- {
- ;
- }
-
- return rights;
- }
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-22 06:28:16 UTC (rev 5763)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-23 12:06:17 UTC (rev 5764)
@@ -29,6 +29,7 @@
import java.util.Vector;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
+import com.kysoh.plugins.facebook.configuration.FacebookDatasStruct;
import com.kysoh.plugins.facebook.configuration.PluginFacebookConfiguration;
import com.kysoh.plugins.facebook.FacebookConnection;
@@ -37,7 +38,9 @@
private boolean check = false;
private boolean throwed = false;
+
private FacebookFunctions functions;
+ private FacebookDatasStruct facebookHistory;
/**
* Throws the result in case of Check mode.
@@ -64,6 +67,7 @@
else
{
this.RunOrCheck();
+ System.exit(0);
}
}
@@ -89,7 +93,6 @@
//Prompt web browser for facebook permissions.
FacebookConnection.promptAuthorizations(options);
- //TODO check actual permissions.
}
@@ -102,19 +105,11 @@
if ( facebook.Connect(this.configuration().getLogin(), this.configuration().getPassword()) )
{
+ //Facebook global functions object.
functions = new FacebookFunctions(facebook.getClient());
- //Checking first if user has fb rights.
- if(!this.getCommand().equalsIgnoreCase("check"))
- {
- //like gmail plugin, only in run mode.
- functions.getCurrentFBAuth();
-
- if(false)
- {
- this.doConfigure();
- }
- }
+ //History object.
+ facebookHistory = new FacebookDatasStruct(this.configuration().getLogin());
//Updating user status.
if(this.configuration().getUpdateStatus())
@@ -150,10 +145,19 @@
{
this.throwResult(false);
}
+
+
+ //Registering facebook history structure.
+ if(this.facebookHistory != null)
+ {
+ this.facebookHistory.registerStruct();
+ }
+
}
else
{
- this.throwMessage("I cannot get connected to your facebook account.");
+ if (!this.getCommand().equalsIgnoreCase("check"))
+ this.throwMessage("I cannot get connected to your facebook account.");
}
}
@@ -184,19 +188,25 @@
Hashtable<String, Vector<String>> inbox = new Hashtable<String, Vector<String>>();
inbox = functions.getEmailNotifications();
- if(functions.getEmailNotifications().size() == 1)
+ Vector<String> keys = new Vector<String>(inbox.keySet());
+ //Will contain all messages id's that must be added to the history.
+ Vector<String> historyCache = new Vector<String>();
+
+ //Removing email already triggered.
+ for(int x=0; x < keys.size(); x ++)
{
- throwRes();
- throwMessage("You have one new message");
+ if(this.facebookHistory.isRegistered(FacebookDatasStruct.MESSAGES, keys.get( x )))
+ {
+ inbox.remove(keys.get( x ));
+ }
+ else
+ {
+ historyCache.add( keys.get( x ) );
+ }
}
- else if(inbox.size() > 1)
+ if (inbox.size() == 0)
{
- throwRes();
- this.throwMessage("You have {0} messages", inbox.size());
- }
- else
- {
if (!this.getCommand().equalsIgnoreCase("check"))
{
this.throwMessage("You don't have any messages");
@@ -213,15 +223,25 @@
for(String sender : senders)
{
+
+ throwRes();
if (emailsBySender.get(sender).intValue() == 1)
{
- this.throwMessage("One from {0}", sender);
+ this.throwMessage("One message from {0}", sender);
}
else
{
this.throwMessage("{0} messages from {1}", sender, emailsBySender.get(sender));
}
}
+
+ //Registering history.
+ for(String message_id : historyCache)
+ {
+ this.facebookHistory.addMessage(message_id);
+ }
+
+ this.facebookHistory.registerStruct();
}
}
@@ -231,24 +251,30 @@
*/
private void throwFriendRequests()
{
+ boolean said = false;
Vector<String> f_requests = new Vector<String>();
f_requests = functions.getFriendRequests();
- if (f_requests.size() > 1)
+ if (f_requests.size() > 0)
{
- throwRes();
- this.throwMessage("You have {0} friend requests", f_requests.size());
for(String request : f_requests)
{
- this.throwMessage("From {0}", request);
+ String fid = functions.getFriendRequestID(request);
+ if(! facebookHistory.isRegistered(FacebookDatasStruct.FRIENDS_QUERIES, fid))
+ {
+ throwRes();
+ this.facebookHistory.addFriendRequest(fid);
+ this.throwMessage("{0} request to be your friend", request);
+ said = true;
+ }
}
+ this.facebookHistory.registerStruct();
+
+ if((! this.getCommand().equalsIgnoreCase("check")) && (!said))
+ {
+ this.throwMessage("You don't have any friend requests");
+ }
}
- else if(f_requests.size() == 1)
- {
- throwRes();
- throwMessage("You have one friend request");
- this.throwMessage("From {0}", f_requests.get(0));
- }
else
{
if (! this.getCommand().equalsIgnoreCase("check"))
@@ -265,25 +291,31 @@
*/
private void throwGroupInvites()
{
+ boolean said = false;
//Fetching group invites.
Vector<String> g_invites = new Vector<String>();
g_invites = functions.getGroupInvites();
- if (g_invites.size() > 1)
+ if (g_invites.size() > 0)
{
- throwRes();
- this.throwMessage("You have {0} group invites", g_invites.size());
for(String group : g_invites)
{
- this.throwMessage("From {0}", group);
+ String gid = functions.getGroupID(group);
+ if(! facebookHistory.isRegistered(FacebookDatasStruct.GROUP_INVITES, gid))
+ {
+ throwRes();
+ this.facebookHistory.addGroupInvite(gid);
+ this.throwMessage("You are invited to the following group: {0}", group);
+ said = true;
+ }
}
+
+ this.facebookHistory.registerStruct();
+ if ((! this.getCommand().equalsIgnoreCase("check")) && (!said))
+ {
+ this.throwMessage("You don't have any group invites");
+ }
}
- else if(g_invites.size() == 1)
- {
- throwRes();
- throwMessage("You have one group invite");
- this.throwMessage("From {0}", g_invites.get(0));
- }
else
{
if (! this.getCommand().equalsIgnoreCase("check"))
@@ -299,25 +331,31 @@
*/
private void throwEventInvites()
{
+ boolean said = false;
//Fetching event invites.
Vector<String> e_invites = new Vector<String>();
e_invites = functions.getEventInvites();
- if (e_invites.size() > 1)
+ if (e_invites.size() > 0)
{
- throwRes();
- this.throwMessage("You have {0} event invites", e_invites.size());
- for(String group : e_invites)
+ for(String event : e_invites)
{
- this.throwMessage("To {0}", group);
+ String eid = functions.getEventID( event );
+ if(! facebookHistory.isRegistered(FacebookDatasStruct.EVENT_INVITE, eid))
+ {
+ throwRes();
+ this.facebookHistory.addEventInvite(functions.getEventID(event));
+ this.throwMessage("You are invited to the following event: {0}", event);
+ said = true;
+ }
}
+
+ this.facebookHistory.registerStruct();
+ if ((! this.getCommand().equalsIgnoreCase("check")) && (!said))
+ {
+ this.throwMessage("You don't have any event invites");
+ }
}
- else if(e_invites.size() == 1)
- {
- throwRes();
- throwMessage("You have one event invite");
- this.throwMessage("To {0}", e_invites.get(0));
- }
else
{
if (! this.getCommand().equalsIgnoreCase("check"))
@@ -349,6 +387,10 @@
@Override
protected void onPluginStop() throws Throwable
{
- ;
+ //Registering facebook history structure.
+ if(this.facebookHistory != null)
+ {
+ this.facebookHistory.registerStruct();
+ }
}
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java 2009-10-22 06:28:16 UTC (rev 5763)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/FacebookDatasStruct.java 2009-10-23 12:06:17 UTC (rev 5764)
@@ -80,6 +80,7 @@
{
if(this.vktStruct.size() <= 0)
{
+ //Noting to be written.
return;
}
@@ -107,7 +108,7 @@
try
{
FileInputStream fichier = new FileInputStream(this.structFile);
- ObjectInputStream ois = new ObjectInputStream(fichier);
+ ObjectInputStream ois = new ObjectInputStream(fichier);
return (SerializedVector) ois.readObject();
}
catch (java.io.IOException e)
@@ -125,44 +126,36 @@
/**
* Add a message to the message hashtable.
*/
- public void addMessage(String uuid)
+ public void addMessage(String message_id)
{
- this.vktStruct.addMessage(uuid);
+ this.vktStruct.add(new String("mes:" + message_id));
}
/**
* Add a reply to the reply hashtable.
*/
- public void addEventInvite(String uuid)
+ public void addEventInvite(String event_id)
{
- this.vktStruct.addEventInvite(uuid);
+ this.vktStruct.add(new String("eid:" + event_id));
}
/**
* Add a status for selected friend.
*/
- public void addFriendRequest(String uuid)
+ public void addFriendRequest(String request_id)
{
- this.vktStruct.addFriendQuery(uuid);
+ this.vktStruct.add(new String("fid:" + request_id));
}
- /**
- * Add a reply to the reply hashtable.
- */
- public void addPoke(String uuid)
- {
- this.vktStruct.addPoke(uuid);
- }
-
/**
* Add a status for selected friend.
*/
- public void addGroupInvite(String uuid)
+ public void addGroupInvite(String group_id)
{
- this.vktStruct.addGroupInvite(uuid);
+ this.vktStruct.add(new String("gid:" + group_id));
}
@@ -181,26 +174,23 @@
* @param uuid.
* @return
*/
- public boolean isRegistered(byte list, String uuid)
+ public boolean isRegistered(byte list, String id)
{
switch(list)
{
case FacebookDatasStruct.FRIENDS_QUERIES:
- return vktStruct.FID.contains(uuid);
+ return vktStruct.contains("fid:" + id);
case FacebookDatasStruct.MESSAGES:
- return vktStruct.MES.contains(uuid);
+ return vktStruct.contains("mes:" + id);
case FacebookDatasStruct.GROUP_INVITES:
- return vktStruct.GID.contains(uuid);
+ return vktStruct.contains("gid:" + id);
case FacebookDatasStruct.EVENT_INVITE:
- return vktStruct.EID.contains(uuid);
+ return vktStruct.contains("eid:" + id);
- case FacebookDatasStruct.POKES:
- return vktStruct.POK.contains(uuid);
-
default:
return false;
}
@@ -212,76 +202,15 @@
/**
* Handle a serialized vector of vector<String>
*/
- class SerializedVector extends Vector<Object> implements Serializable{
+ class SerializedVector extends Vector<String> implements Serializable{
- private static final long serialVersionUID = 7018170438526763010L;
+ private static final long serialVersionUID = 7018170438526763045L;
- private Vector<String> GID = new Vector<String>();
- private Vector<String> FID = new Vector<String>();
- private Vector<String> POK = new Vector<String>();
- private Vector<String> EID = new Vector<String>();
- private Vector<String> MES = new Vector<String>();
public SerializedVector()
{
super();
}
- /**
- * Add a new message in the object.
- */
- public void addMessage(String uuid)
- {
- if (! MES.contains(uuid))
- {
- MES.add(uuid);
- }
- }
-
-
- /**
- * Add a new event invite in the object.
- */
- public void addEventInvite(String uuid)
- {
- if (! EID.contains(uuid))
- {
- EID.add(uuid);
- }
- }
-
-
- /**
- * Add a new user request in the object.
- */
- public void addFriendQuery(String uuid)
- {
- if (! FID.contains(uuid))
- {
- FID.add(uuid);
- }
- }
-
- /**
- * Add a new user status in the object.
- */
- public void addGroupInvite(String uuid)
- {
- if (! GID.contains(uuid))
- {
- GID.add(uuid);
- }
- }
-
- /**
- * Add a new poke notification in the object.
- */
- public void addPoke(String uuid)
- {
- if (! POK.contains(uuid))
- {
- POK.add(uuid);
- }
- }
}
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java 2009-10-22 06:28:16 UTC (rev 5763)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/FacebookSessionUtils.java 2009-10-23 12:06:17 UTC (rev 5764)
@@ -23,7 +23,14 @@
package com.kysoh.plugins.facebook.connection;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Vector;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpState;
@@ -44,8 +51,17 @@
public static String lastTokenUsed;
public static FacebookXmlRestClient lastClientUsed;
+
+
+ private static SerializedVector sessionUtils = new SerializedVector();
+ static
+ {
+ sessionUtils.add("0");
+ sessionUtils.add("1");
+ }
+
public static void setMail(String eMail)
{
mail = eMail;
@@ -71,7 +87,7 @@
final String LOGIN = "http://www.facebook.com/login.php";
GetMethod get = new GetMethod(LOGIN + "?api_key=" + api_key + "&v=1.0&auth_token=" + token );
-
+
http.executeMethod(get);
PostMethod post = new PostMethod(LOGIN);
@@ -88,4 +104,122 @@
lastClientUsed = client;
return sessionID;
}
+
+
+ /**
+ * Register the last known session secret.
+ * @param aSessionSecret
+ */
+ public static void registerSessionSecret(String aSessionSecret)
+ {
+ sessionUtils.set(0, new String(aSessionSecret));
+ }
+
+
+ /**
+ * Return the last used session secret.
+ * @return
+ */
+ public static String getSessionSecret()
+ {
+ return (String) sessionUtils.get( 0 );
+ }
+
+
+ /**
+ * Register the last known session key.
+ * @param aSessionKey
+ */
+ public static void registerSessionKey(String aSessionKey)
+ {
+ sessionUtils.set(1, new String(aSessionKey));
+ }
+
+
+ /**
+ * Return the last used session key.
+ * @return
+ */
+ public static String getSessionKey()
+ {
+ return (String) sessionUtils.get( 1 );
+ }
+
+
+
+ /**
+ * Load the serialized vector containing old session datas.
+ */
+ public static void loadSession()
+ {
+ try
+ {
+ File path = new File("");
+ File session = new File( path.getAbsolutePath() + File.separator + "session");
+
+ if(session.isFile())
+ {
+ FileInputStream fichier = new FileInputStream("session");
+ ObjectInputStream ois = new ObjectInputStream(fichier);
+ sessionUtils = (SerializedVector) ois.readObject();
+ }
+ else
+ {
+ sessionUtils = new SerializedVector();
+ sessionUtils.add("0");
+ sessionUtils.add("0");
+ }
+ }
+ catch (java.io.IOException e)
+ {
+ e.printStackTrace();
+ }
+ catch (ClassNotFoundException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * Register the current session as the last known.
+ */
+ public static void registerSession()
+ {
+ if(sessionUtils.size() <= 0)
+ {
+ //Noting to be written.
+ return;
+ }
+
+ try
+ {
+ File path = new File("");
+ File session = new File( path.getAbsolutePath() + File.separator + "session");
+ FileOutputStream file = new FileOutputStream(session.getAbsolutePath());
+ ObjectOutputStream oos = new ObjectOutputStream(file);
+ oos.writeObject(sessionUtils);
+ oos.flush();
+ oos.close();
+ }
+ catch (java.io.IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Handle a serialized vector of vector<String>
+ */
+ static class SerializedVector extends Vector<String> implements Serializable{
+
+ private static final long serialVersionUID = 7018170438526763036L;
+
+
+ public SerializedVector()
+ {
+ super();
+ }
+
+ }
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-22 06:28:35
|
Author: ks156 Date: 2009-10-22 08:28:16 +0200 (Thu, 22 Oct 2009) New Revision: 5763 Added: software_suite_v3/smart-core/smart-api/java/trunk/AUTHORS software_suite_v3/smart-core/smart-api/java/trunk/COPYING software_suite_v3/smart-core/smart-api/java/trunk/VERSION software_suite_v3/smart-core/smart-api/java/trunk/doc/ Removed: software_suite_v3/smart-core/smart-api/java/trunk/src/AUTHORS software_suite_v3/smart-core/smart-api/java/trunk/src/COPYING software_suite_v3/smart-core/smart-api/java/trunk/src/VERSION software_suite_v3/smart-core/smart-api/java/trunk/src/doc/ Log: * Refarmated the project structure. Copied: software_suite_v3/smart-core/smart-api/java/trunk/AUTHORS (from rev 5762, software_suite_v3/smart-core/smart-api/java/trunk/src/AUTHORS) =================================================================== --- software_suite_v3/smart-core/smart-api/java/trunk/AUTHORS (rev 0) +++ software_suite_v3/smart-core/smart-api/java/trunk/AUTHORS 2009-10-22 06:28:16 UTC (rev 5763) @@ -0,0 +1,5 @@ +Tuxdroid java API was written by: + + Remi Jocaille <rem...@c2...> + +Contributors: Copied: software_suite_v3/smart-core/smart-api/java/trunk/COPYING (from rev 5762, software_suite_v3/smart-core/smart-api/java/trunk/src/COPYING) =================================================================== --- software_suite_v3/smart-core/smart-api/java/trunk/COPYING (rev 0) +++ software_suite_v3/smart-core/smart-api/java/trunk/COPYING 2009-10-22 06:28:16 UTC (rev 5763) @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Copied: software_suite_v3/smart-core/smart-api/java/trunk/VERSION (from rev 5762, software_suite_v3/smart-core/smart-api/java/trunk/src/VERSION) =================================================================== --- software_suite_v3/smart-core/smart-api/java/trunk/VERSION (rev 0) +++ software_suite_v3/smart-core/smart-api/java/trunk/VERSION 2009-10-22 06:28:16 UTC (rev 5763) @@ -0,0 +1 @@ +0.3.0 Copied: software_suite_v3/smart-core/smart-api/java/trunk/doc (from rev 5762, software_suite_v3/smart-core/smart-api/java/trunk/src/doc) Deleted: software_suite_v3/smart-core/smart-api/java/trunk/src/AUTHORS =================================================================== --- software_suite_v3/smart-core/smart-api/java/trunk/src/AUTHORS 2009-10-22 06:26:55 UTC (rev 5762) +++ software_suite_v3/smart-core/smart-api/java/trunk/src/AUTHORS 2009-10-22 06:28:16 UTC (rev 5763) @@ -1,5 +0,0 @@ -Tuxdroid java API was written by: - - Remi Jocaille <rem...@c2...> - -Contributors: Deleted: software_suite_v3/smart-core/smart-api/java/trunk/src/COPYING =================================================================== --- software_suite_v3/smart-core/smart-api/java/trunk/src/COPYING 2009-10-22 06:26:55 UTC (rev 5762) +++ software_suite_v3/smart-core/smart-api/java/trunk/src/COPYING 2009-10-22 06:28:16 UTC (rev 5763) @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Deleted: software_suite_v3/smart-core/smart-api/java/trunk/src/VERSION =================================================================== --- software_suite_v3/smart-core/smart-api/java/trunk/src/VERSION 2009-10-22 06:26:55 UTC (rev 5762) +++ software_suite_v3/smart-core/smart-api/java/trunk/src/VERSION 2009-10-22 06:28:16 UTC (rev 5763) @@ -1 +0,0 @@ -0.3.0 |
|
From: ks156 <c2m...@c2...> - 2009-10-22 06:27:11
|
Author: ks156 Date: 2009-10-22 08:26:55 +0200 (Thu, 22 Oct 2009) New Revision: 5762 Added: software_suite_v3/smart-core/smart-api/java/ software_suite_v3/smart-core/smart-api/java/branches/ software_suite_v3/smart-core/smart-api/java/tags/ software_suite_v3/smart-core/smart-api/java/trunk/ Log: * Imported the java API from the software suite v2 directory. Copied: software_suite_v3/smart-core/smart-api/java/trunk (from rev 5761, software_suite_v2/tuxware/java-api/branches/0.3.0) |
|
From: ks156 <c2m...@c2...> - 2009-10-21 11:24:20
|
Author: ks156
Date: 2009-10-21 13:24:06 +0200 (Wed, 21 Oct 2009)
New Revision: 5761
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java
Log:
* Added the dutch translations
* Fixed a string in the code
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po 2009-10-21 11:23:33 UTC (rev 5760)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po 2009-10-21 11:24:06 UTC (rev 5761)
@@ -38,115 +38,115 @@
msgstr "Check mijn Twitter account automatisch"
msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
+msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wacht woord correct zijn ingegeven."
msgid "There is a new Tweet available."
msgstr "Er is een nieuwe Tweet beschikbaar."
msgid "You have a new Tweet"
-msgstr "You have a new Tweet"
+msgstr "Je hebt een nieuwe Tweet beschikbaar"
msgid "You have a new Tweet on your Twitter"
-msgstr "You have a new Tweet on your Twitter"
+msgstr "Je hebt een nieuwe Tweet beschikbaar op je Twitter"
msgid "I found a new Tweet on your Twitter account"
-msgstr "I found a new Tweet on your Twitter account"
+msgstr "Ik heb een nieuwe Tweet gevonden op je Twitter account"
msgid "There is a new Tweet on your Twitter page"
-msgstr "There is a new Tweet on your Twitter page"
+msgstr "Er is een nieuwe Tweet beschikbaar op je Twitter pagina"
msgid "You have {0} new Tweets."
-msgstr "Je hebt {0} nieuwe Tweets."
+msgstr "Je hebt {0} nieuwe Tweet beschikbaar."
msgid "There are {0} new Tweets available"
-msgstr "There are {0} new Tweets available"
+msgstr "Er zijn {0} nieuwe Tweet beschikbaar"
msgid "You have {0} new Tweets on your Twitter"
-msgstr "You have {0} new Tweets on your Twitter"
+msgstr "Je hebt {0} nieuwe Tweet op je Twitter"
msgid "I found {0} new Tweets on your Twitter account"
-msgstr "I found {0} new Tweets on your Twitter account"
+msgstr "Ik heb {0} nieuwe Tweet gevonden op je Twitter account"
msgid "There are {0} new Tweets on your Twitter page"
-msgstr "There are {0} new Tweets on your Twitter page"
+msgstr "Er zijn {0} nieuwe Tweet beschikbaar op je Twitter pagina"
msgid "You don't have any new Tweets."
-msgstr "Je hebt geen nieuwe Tweets."
+msgstr "Je hebt geen nieuwe Tweet beschikbaar"
msgid "I couldn't find any new Tweets"
-msgstr "I couldn't find any new Tweets"
+msgstr "Ik heb geen nieuwe Tweet gevonden"
msgid "There are no new Tweets available"
-msgstr "There are no new Tweets available"
+msgstr "Er zijn geen nieuwe Tweet beschikbaar"
msgid "No new Tweets detected"
-msgstr "No new Tweets detected"
+msgstr "Geen nieuwe Tweet gevonden"
msgid "I couldn't detect any new Tweets"
-msgstr "I couldn't detect any new Tweets"
+msgstr "Ik kan geen nieuwe Tweet vinden"
msgid "You don't have any messages"
-msgstr "Je hebt geen nieuwe berichten."
+msgstr "Je hebt geen nieuwe berichten"
msgid "You have no private messages"
-msgstr "You have no private messages"
+msgstr "Je hebt geen persoonlijke berichten"
msgid "I couldn't find any new messages"
-msgstr "I couldn't find any new messages"
+msgstr "Ik kan geen nieuwe berichten vinden"
msgid "There are no new private messages"
-msgstr "There are no new private messages"
+msgstr "Er zijn geen nieuwe persoonlijke berichten"
msgid "No private messages detected"
-msgstr "No private messages detected"
+msgstr "Geen persoonlijke berichten gevonden"
msgid "You don't have any replies"
-msgstr "Je hebt geen nieuwe antwoorden."
+msgstr "Je hebt geen nieuwe antwoorden"
msgid "You have no new replies"
-msgstr "You have no new replies"
+msgstr "Je hebt geen antwoorden"
msgid "There are no replies"
-msgstr "There are no replies"
+msgstr "Er zijn geen antwoorden"
msgid "I could not find any replies"
-msgstr "I could not find any replies"
+msgstr "Ik heb geen antwoorden gevonden"
msgid "There are no new replies detected"
-msgstr "There are no new replies detected"
+msgstr "Er werden geen nieuwe antwoorden gevonden"
msgid "Your new Tweet was not set, please, try again later"
-msgstr "Je nieuwe Tweet werd niet geplaatst, probeer later opnieuw."
+msgstr "Je nieuwe Tweet werd niet geplaatst, probeer later opnieuw"
msgid "Your Tweet was added"
-msgstr "Je nieuwe Tweet werd toegevoegd."
+msgstr "Je nieuwe Tweet werd toegevoegd"
msgid "Twitter is busy for now, please, try again later."
msgstr "Twitter is bezet op het ogenblik, probeer later opnieuw."
msgid "One reply from {0}"
-msgstr "Je hebt 1 antwoord van {0}."
+msgstr "Je hebt 1 antwoord van {0}"
msgid "{0} replies from {1}"
-msgstr "{0} antwoorden van {1}."
+msgstr "{0} antwoorden van {1}"
msgid "One message from {0}"
-msgstr "1 bericht van {0}."
+msgstr "1 bericht van {0}"
msgid "{0} messages from {1}"
-msgstr "{0} berichten van {1}."
+msgstr "{0} berichten van {1}"
msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
msgstr "Sorry, ik kan geen connectie maken met Twitter. Controleer je configuratie of probeer later opnieuw."
msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
-msgstr"I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr "Ik kan geen connectie maken met je Twitter account. Gelieve na te kijken of je Twitter configuratie correct is."
msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
-msgstr "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr "Ik denk dat je log-in of wacht woord verkeerd zijn. Gelieve je Twitter gadget configuratie te controleren."
msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
-msgstr "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr "Ik kreeg een foutmelding bij het connecteren met je Twitter account. Controleer je log-in en wacht woord in de Twitter gadget configuratie."
msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
-msgstr "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr "Ik kan geen verbinding maken met je Twitter. Controleer of je de correcte log-in en wacht woord hebt ingegeven."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java 2009-10-21 11:23:33 UTC (rev 5760)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java 2009-10-21 11:24:06 UTC (rev 5761)
@@ -396,7 +396,7 @@
}
else
{
- throwMessage("Twitter is busy for now, please, try later.");
+ throwMessage("Twitter is busy for now, please, try again later.");
}
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-21 11:23:44
|
Author: ks156
Date: 2009-10-21 13:23:33 +0200 (Wed, 21 Oct 2009)
New Revision: 5760
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Added exception for 23h45, 00h15, 00h30, 11h45, 12h15 and 12h30.
* Added the dutch translations
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-21 10:06:28 UTC (rev 5759)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-21 11:23:33 UTC (rev 5760)
@@ -49,15 +49,33 @@
msgid "It's a quarter after {0}"
msgstr "It's a quarter after {0}"
+msgid "It's quarter past midnight"
+msgstr "It's quarter past midnight"
+
+msgid "It's quarter past noon"
+msgstr "It's quarter past noon"
+
msgid "It's quarter to {0}"
msgstr "It's quarter to {0}"
msgid "It's a quarter until {0}"
msgstr "It's a quarter until {0}"
+msgid "It's quarter to midnight"
+msgstr "It's quarter to midnight"
+
+msgid "It's quarter to noon"
+msgstr "It's quarter to noon"
+
msgid "It's half past {0}"
msgstr "It's half past {0}"
+msgid "It's half past midnight"
+msgstr "It's half past midnight"
+
+msgid "It's half past noon"
+msgstr "It's half past noon"
+
msgid "Start every x from full hour"
msgstr "Alerts"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-21 10:06:28 UTC (rev 5759)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-21 11:23:33 UTC (rev 5760)
@@ -47,17 +47,35 @@
msgstr "Il est {0} heures et quart"
msgid "It's a quarter after {0}"
-msgstr "Il est {0} heures et un quart"
+msgstr "Il est {0} heures quart"
+msgid "It's quarter past midnight"
+msgstr "Il est minuit et quart"
+
+msgid "It's quarter past noon"
+msgstr "Il est midi et quart"
+
msgid "It's quarter to {0}"
msgstr "Il est {0} heures moins quart"
msgid "It's a quarter until {0}"
msgstr "Il est {0} heures moins le quart"
+msgid "It's quarter to midnight"
+msgstr "Il est minuit moins quart"
+
+msgid "It's quarter to noon"
+msgstr "Il est midi moins quart"
+
msgid "It's half past {0}"
msgstr "Il est {0} heures et demi"
+msgid "It's half past midnight"
+msgstr "Il est minuit et demi"
+
+msgid "It's half past noon"
+msgstr "Il est midi et demi"
+
msgid "Start every x from full hour"
msgstr "Alertes"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-21 10:06:28 UTC (rev 5759)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-21 11:23:33 UTC (rev 5760)
@@ -7,56 +7,56 @@
msgid "This plugin gives you the time."
msgstr "Deze plugin geeft de tijd weer."
-msgid "Current time is {0} hours and {1} minutes."
+msgid "It is {0} hours and {1} minutes."
msgstr "Het is nu {0} uur en {1} minuten."
msgid "It is {0} hours {1}."
-msgstr "It is {0} hours {1}."
+msgstr "Het is {0} uur {1}."
msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
-msgstr "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr "Bij de volgende biep, is het precies {0} uur {1} ... BIEP !"
msgid "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
-msgstr "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
+msgstr "Bij de volgende biep, is het {0} uur en {1} minuten ... BIEP !"
msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1} minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1} minutes"
+msgstr "Het is {1} uur en {0} minuten ... Oeps, ik bedoel {0} uur en {1} minuten"
msgid "It's {1} hours {0} ... oops, I mean {0} hours {1}."
-msgstr "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+msgstr "Het is {1} uur {0} ... Oeps, ik bedoel {0} uur {1}."
msgid "It is {0} o'clock"
-msgstr "It is {0} o'clock"
+msgstr "Het is kop {0} uur"
msgid "It's exactly {0} hours"
-msgstr "Het is nu {0} uur."
+msgstr "Het is nu precies {0} uur."
msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
-msgstr "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr "Bij de volgende biep, is het kop {0} uur ... BIEP !"
msgid "At the next beep it will be {0} o'clock ... BEEP !"
-msgstr "At the next beep it will be {0} o'clock ... BEEP !"
+msgstr "Bij de volgende biep, is het {0} uur ... BIEP !"
msgid "It's midnight"
-msgstr "It's midnight"
+msgstr "Het is middernacht"
msgid "It's noon"
-msgstr "It's noon"
+msgstr "Het is middag"
msgid "It's quarter past {0}"
-msgstr "It's quarter past {0}"
+msgstr "Het is kwart na {0}"
msgid "It's a quarter after {0}"
-msgstr "It's a quarter after {0}"
+msgstr "Het is kwart over {0}"
msgid "It's quarter to {0}"
-msgstr "It's quarter to {0}"
+msgstr "Het is kwart voor {0}"
msgid "It's a quarter until {0}"
-msgstr "It's a quarter until {0}"
+msgstr "Het is kwart voor {0}"
msgid "It's half past {0}"
-msgstr "It's half past {0}"
+msgstr "Het is half {0}"
msgid "Start every x from full hour"
msgstr "Alarmen"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-21 10:06:28 UTC (rev 5759)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-21 11:23:33 UTC (rev 5760)
@@ -49,15 +49,33 @@
msgid "It's a quarter after {0}"
msgstr ""
+msgid "It's quarter past midnight"
+msgstr ""
+
+msgid "It's quarter past noon"
+msgstr ""
+
msgid "It's quarter to {0}"
msgstr ""
msgid "It's a quarter until {0}"
msgstr ""
+msgid "It's quarter to midnight"
+msgstr ""
+
+msgid "It's quarter to noon"
+msgstr ""
+
msgid "It's half past {0}"
msgstr ""
+msgid "It's half past midnight"
+msgstr ""
+
+msgid "It's half past noon"
+msgstr ""
+
msgid "Start every x from full hour"
msgstr ""
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-21 10:06:28 UTC (rev 5759)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-21 11:23:33 UTC (rev 5760)
@@ -79,6 +79,7 @@
Random rand = new Random();
Boolean random = rand.nextBoolean();
+ String language = configuration().getLanguage();
if (m == 0) {
if (h == 0) {
@@ -92,29 +93,69 @@
}
}
else if (m == 15) {
- if (random) {
- throwMessage("It's quarter past {0}", h);
+ if (h == 0 && !(language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's quarter past midnight");
}
- else {
- throwMessage("It's a quarter after {0}", h);
+ else if (h == 12 && !(language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's quarter past noon");
}
+ else if (h == 0 && (language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's a quarter after {0}", "12");
+ }
+ else
+ {
+ if (random) {
+ throwMessage("It's quarter past {0}", h);
+ }
+ else {
+ throwMessage("It's a quarter after {0}", h);
+ }
+ }
}
else if (m == 30) {
- String language = configuration().getLanguage();
if (language.equals("nl") || language.equals("de")) {
throwMessage("It's half past {0}", h+1);
}
else {
- throwMessage("It's half past {0}", h);
+ if (h == 0)
+ {
+ throwMessage("It's half past midnight");
+ }
+ else if (h == 12)
+ {
+ throwMessage("It's half past noon");
+ }
+ else
+ {
+ throwMessage("It's half past {0}", h);
+ }
}
}
else if (m == 45) {
- if (random) {
- throwMessage("It's quarter to {0}", (h + 1));
+ if (h == 23 && !(language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's quarter to midnight");
}
- else {
- throwMessage("It's a quarter until {0}", (h + 1));
+ else if (h == 11 && !(language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's quarter to noon");
}
+ else if (h == 23 && (language.equals("nl") || language.equals("de")))
+ {
+ throwMessage("It's quarter to {0}", "12");
+ }
+ else
+ {
+ if (random) {
+ throwMessage("It's quarter to {0}", (h + 1));
+ }
+ else {
+ throwMessage("It's a quarter until {0}", (h + 1));
+ }
+ }
}
else {
throwMessage(this.pickSentence(normalSentences), h, m);
|
|
From: jerome <c2m...@c2...> - 2009-10-21 10:06:40
|
Author: jerome
Date: 2009-10-21 12:06:28 +0200 (Wed, 21 Oct 2009)
New Revision: 5759
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Fixed a bug getting messages count by sender ( message id was taken instead of user id ).
* Added a method to define current FB permissions.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-21 10:03:30 UTC (rev 5758)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-21 10:06:28 UTC (rev 5759)
@@ -34,6 +34,7 @@
import com.google.code.facebookapi.FacebookException;
import com.google.code.facebookapi.FacebookJsonRestClient;
+import com.kysoh.plugins.facebook.connection.FacebookSessionUtils;
public class FacebookFunctions {
@@ -283,10 +284,11 @@
public String getFacebookName(String uid)
{
String result = "Unknown";
- String query = "SELECT name from user WHERE uid=";
+ String query = "SELECT name FROM user WHERE uid=";
try
{
+ System.out.println(client.fql_query(query + uid));
JSONArray username = (JSONArray) client.fql_query(query + uid);
result = username.getJSONObject( 0 ).getString("name");
@@ -337,29 +339,58 @@
public Hashtable<String, Integer> getByNames(Hashtable<String, Vector<String>> baseHash)
{
Hashtable<String, Integer> result = new Hashtable<String, Integer>();
- Vector<String> v = new Vector<String>(baseHash.keySet());
+ Vector<String> senders = new Vector<String>();
//Handling no datas into hashtable.
- if ( v.size() == 0)
+ if ( baseHash.keySet().size() == 0)
{
return null;
}
+ Iterator<String> it = baseHash.keySet().iterator();
+
+ //Gettin all senders ( subject and message id are only for history stuff ).
+ while(it.hasNext())
+ {
+ senders.add(baseHash.get(it.next()).get(1));
+ }
+
//Counting by names.
- for( int i = 0 ; i != v.size() ; i ++)
+ for( int i = 0 ; i != senders.size() ; i ++)
{
- if (result.containsKey(v.get(i)))
+ if (result.containsKey(senders.get(i)))
{
- Integer value = Integer.valueOf(result.get(v.get(i)) + 1);
- result.remove(v.get(i));
- result.put(v.get(i), value);
+ Integer value = Integer.valueOf(result.get(senders.get(i)) + 1);
+ result.remove(senders.get(i));
+ result.put(senders.get(i), value);
}
else
{
- result.put(v.get(i), Integer.valueOf(1));
+ result.put(senders.get(i), Integer.valueOf(1));
}
}
return result;
}
+
+
+ /**
+ * Return the current fb rights for the plugin.
+ * @return
+ */
+ public Vector<String> getCurrentFBAuth()
+ {
+ Vector<String> rights = new Vector<String>();
+
+ try
+ {
+ System.out.println(client.permissions_checkAvailableApiAccess(FacebookSessionUtils.api_key));
+ }
+ catch (FacebookException e)
+ {
+ ;
+ }
+
+ return rights;
+ }
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-21 10:03:30 UTC (rev 5758)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-21 10:06:28 UTC (rev 5759)
@@ -104,6 +104,18 @@
{
functions = new FacebookFunctions(facebook.getClient());
+ //Checking first if user has fb rights.
+ if(!this.getCommand().equalsIgnoreCase("check"))
+ {
+ //like gmail plugin, only in run mode.
+ functions.getCurrentFBAuth();
+
+ if(false)
+ {
+ this.doConfigure();
+ }
+ }
+
//Updating user status.
if(this.configuration().getUpdateStatus())
{
@@ -203,11 +215,11 @@
{
if (emailsBySender.get(sender).intValue() == 1)
{
- this.throwMessage("One from {0}", functions.getFacebookName(sender));
+ this.throwMessage("One from {0}", sender);
}
else
{
- this.throwMessage("{0} messages from {1}", functions.getFacebookName(sender), emailsBySender.get(sender));
+ this.throwMessage("{0} messages from {1}", sender, emailsBySender.get(sender));
}
}
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-21 10:03:42
|
Author: ks156
Date: 2009-10-21 12:03:30 +0200 (Wed, 21 Oct 2009)
New Revision: 5758
Modified:
software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po
Log:
* Added the dutch translations
Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po 2009-10-21 10:03:03 UTC (rev 5757)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po 2009-10-21 10:03:30 UTC (rev 5758)
@@ -27,7 +27,7 @@
msgstr "Controleer of er nieuwe E-mail is"
msgid "Read your mail"
-msgstr "Lees jouw E-mail"
+msgstr "Lees je E-mail"
msgid "User parameters"
msgstr "Gebruikersinstellingen"
@@ -42,58 +42,58 @@
msgstr "Opties"
msgid "You have a new mail."
-msgstr "Je hebt een nieuw bericht."
+msgstr "Je hebt een nieuwe email."
msgid "A new mail has arrived !"
-msgstr "A new mail has arrived !"
+msgstr "Er is een nieuwe mail binnengekomen !"
msgid "It appears you have received a new email."
-msgstr "It appears you have received a new email."
+msgstr "Ik geloof dat je nieuwe mail hebt."
msgid "A new email ? I wonder who could be thinking about you."
-msgstr "A new email ? I wonder who could be thinking about you."
+msgstr "Een nieuwe email ? Ik ben benieuwd van wie het is."
msgid "It would appear you have received new mails."
-msgstr "It would appear you have received new mails."
+msgstr "Ik geloof dat er nieuwe mails zijn binnengekomen."
msgid "Mail sent by {0}"
msgstr "Dit bericht werd verzonden door {0}"
msgid "The email was sent by {0}"
-msgstr "The email was sent by {0}"
+msgstr "De email werd verzonden door {0}"
msgid "The sender of the mail is {0}"
-msgstr "The sender of the mail is {0}"
+msgstr "De afzender van de mail is {0}"
msgid "The sender is {0}"
-msgstr "The sender is {0}"
+msgstr "De afzender is {0}"
msgid "The email subject is : {0}"
msgstr "Het onderwerp is : {0}"
msgid "The subject of the email is : {0}"
-msgstr "The subject of the email is : {0}"
+msgstr "Het onderwerp van de email is : {0}"
msgid "The email topic is : {0}"
-msgstr "The email topic is : {0}"
+msgstr "Het email onderwerp is : {0}"
msgid "The topic is : {0}"
-msgstr "The topic is : {0}"
+msgstr "Het onderwerp is : {0}"
msgid "The title of the email is : {0}"
-msgstr "The title of the email is : {0}"
+msgstr "De titel van de email is : {0}"
msgid "No new mail."
msgstr "Geen nieuwe mails."
msgid "I'm sorry, nobody sent you any email."
-msgstr "I'm sorry, nobody sent you any email."
+msgstr "Sorry, niemand heeft je een mail gestuurd."
msgid "No mails. Nobody seems to be thinking about you."
-msgstr "No mails. Nobody seems to be thinking about you."
+msgstr "Geen nieuwe mails. Er lijkt op het ogenblik niemand aan jou te denken."
msgid "Your mailbox is empty."
-msgstr "Your mailbox is empty."
+msgstr "Je mailbox is leeg."
msgid "your_user"
msgstr "jouw_login"
@@ -120,10 +120,10 @@
msgstr "Je moet je pop3 service activeren in je Mail account"
msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later."
-msgstr "Sorry, ik kan geen connectie maken met de mailserver. Controleer je internet connectie of probeer later opnieuw."
+msgstr "Sorry, ik kan geen connectie maken met de mail server. Controleer je internet connectie of probeer later opnieuw."
msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration."
-msgstr "Sorry, ik kan niet inloggen op de mailserver. Controleer of je email configuratie correct is."
+msgstr "Sorry, ik kan niet inloggen op de mail server. Controleer of je email configuratie correct is."
msgid "Start every x"
msgstr "Alarmen"
@@ -138,13 +138,13 @@
msgstr "Check mijn E-mail op regelmatige tijdstippen"
msgid "G-mail is busy right now. Please try again later."
-msgstr "G-mail is busy right now. Please try again later."
+msgstr "Gimail is bezet op het ogenblik. Probeer later opnieuw."
msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
-msgstr "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr "De Goegel mail website heeft veel verkeer op het moment. Beter om later opnieuw te proberen."
msgid "I'm having difficulties to connect to Google mail. Please try again later."
-msgstr "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr "Ik heb problemen om een verbinding te maken met Goegel mail. Gelieve later opnieuw te proberen."
msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
-msgstr "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr "Ik krijg een time-out als ik een verbinding maak met je Gimail account. De Goegel mail website, heeft teveel verkeer op het ogenblik."
|
|
From: ks156 <c2m...@c2...> - 2009-10-21 10:03:17
|
Author: ks156
Date: 2009-10-21 12:03:03 +0200 (Wed, 21 Oct 2009)
New Revision: 5757
Modified:
software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po
Log:
* Added the dutch translations
Modified: software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po 2009-10-21 09:47:08 UTC (rev 5756)
+++ software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po 2009-10-21 10:03:03 UTC (rev 5757)
@@ -27,7 +27,7 @@
msgstr "Controleer of er nieuwe E-mail is"
msgid "Read your mail"
-msgstr "Lees jouw E-mail"
+msgstr "Lees je E-mail"
msgid "User parameters"
msgstr "Gebruikersinstellingen"
@@ -42,58 +42,58 @@
msgstr "Opties"
msgid "You have a new mail."
-msgstr "Je hebt een nieuw bericht."
+msgstr "Je hebt een nieuwe email."
msgid "A new mail has arrived !"
-msgstr "A new mail has arrived !"
+msgstr "Er is een nieuwe mail binnengekomen !"
msgid "It appears you have received a new email."
-msgstr "It appears you have received a new email."
+msgstr "Ik geloof dat je nieuwe mail hebt."
msgid "A new email ? I wonder who could be thinking about you."
-msgstr "A new email ? I wonder who could be thinking about you."
+msgstr "Een nieuwe email ? Ik ben benieuwd van wie het is."
msgid "It would appear you have received new mails."
-msgstr "It would appear you have received new mails."
+msgstr "Ik geloof dat er nieuwe mails zijn binnengekomen."
msgid "Mail sent by {0}"
-msgstr "Dit bericht werd verzonden door {0}"
+msgstr "De email werd verzonden door {0}"
msgid "The email was sent by {0}"
-msgstr "The email was sent by {0}"
+msgstr "De email komt van {0}"
msgid "The sender of the mail is {0}"
-msgstr "The sender of the mail is {0}"
+msgstr "De afzender van de mail is {0}"
msgid "The sender is {0}"
-msgstr "The sender is {0}"
+msgstr "De afzender is {0}"
msgid "The email subject is : {0}"
msgstr "Het onderwerp is : {0}"
msgid "The subject of the email is : {0}"
-msgstr "The subject of the email is : {0}"
+msgstr "Het onderwerp van de email is : {0}"
msgid "The email topic is : {0}"
-msgstr "The email topic is : {0}"
+msgstr "Het email onderwerp is : {0}"
msgid "The topic is : {0}"
-msgstr "The topic is : {0}"
+msgstr "Het onderwerp is : {0}"
msgid "The title of the email is : {0}"
-msgstr "The title of the email is : {0}"
+msgstr "De titel van de email is : {0}"
msgid "No new mail."
msgstr "Geen nieuwe mails."
msgid "I'm sorry, nobody sent you any email."
-msgstr "I'm sorry, nobody sent you any email."
+msgstr "Sorry, niemand heeft je een mail gestuurd."
msgid "No mails. Nobody seems to be thinking about you."
-msgstr "No mails. Nobody seems to be thinking about you."
+msgstr "Geen nieuwe mails. Er lijkt op het ogenblik niemand aan jou te denken."
msgid "Your mailbox is empty."
-msgstr "Your mailbox is empty."
+msgstr "Je mailbox is leeg."
msgid "your_user"
msgstr "jouw_login"
|
|
From: ks156 <c2m...@c2...> - 2009-10-21 09:47:20
|
Author: ks156
Date: 2009-10-21 11:47:08 +0200 (Wed, 21 Oct 2009)
New Revision: 5756
Modified:
software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po
Log:
* Added the dutch translations
Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po 2009-10-20 15:42:29 UTC (rev 5755)
+++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po 2009-10-21 09:47:08 UTC (rev 5756)
@@ -24,64 +24,64 @@
msgstr "Het weer vandaag in {0} is "{1}" met een temperatuur van {2} graden {3}. De vochtigheidsgraad is {4} percent."
msgid "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
-msgstr "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
+msgstr "In {0}, is het weer {1} met een temperatuur van {2} graden {3}. De vochtigheidgraad is {4} procent."
msgid "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
-msgstr "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
+msgstr "Het weer is op het ogenblik {1} in {0} met een vochtigheidsgraad van {4} percent. De temperatuur is rond de {2} graden {3}."
msgid "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
-msgstr "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
+msgstr "Bij een temperatuur van {2} graden {3}, is het weer in {0} {1}, met een vochtigheidsgraad van {4} percent."
msgid "Current weather is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
-msgstr "Current weather is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
+msgstr "Het weer is op het ogenblik \"{1}\" met een temperatuur van {2} graden {3}; De vochtigheidsgraad bedraagt {4} percent."
msgid "The weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
-msgstr "The weather is {1} with a temperature of {2} degrees {3}; The humidity level is {4} per cent."
+msgstr "Het weer is {1} met een temperatuur van {2} graden {3}; De vochtigheidsgraad bedraagt {4} procent."
msgid "The weather is currently {1} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
-msgstr "The weather is currently {1} with a humidity of {4} per cent. The temperature is around {2} degrees {3};"
+msgstr "Het weer is op het ogenblik {1} met een vochtigheidsgraad van {4} percent. De temperatuur is rond {2} graden {3};"
msgid "With a temperature of {2} degrees {3}, the weather is {1}, and the humidity level is {4} per cent."
-msgstr "With a temperature of {2} degrees {3}; the weather is {1}, and the humidity level is {4} per cent."
+msgstr "Met een temperatuur van {2} graden {3}; is het weer {1}, en de vochtigheidsgraad bedraagt {4} procent."
msgid "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
-msgstr "Het weer vandaag in {0} is "onbekend" met een temperatuur van {2} graden {3}. De vochtigheidsgraad is {4} percent."
+msgstr "Het weer vandaag in {0} is \"onbekend\" met een temperatuur van {2} graden {3}. De vochtigheidsgraad bedraagt {4} percent."
msgid "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
-msgstr "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
+msgstr "In {0}, is het weer \"onbekend\" met een temperatuur van {1} graden {2}. De vochtigheidsgraad bedraagt {3} procent."
msgid "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
-msgstr "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
+msgstr "Het weer is op het ogenblik \"onbekend\" in {0} met een vochtigheidsgraad van {3} procent. De temperatuur bedraagt rond de {1} graden {2}."
msgid "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
-msgstr "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
+msgstr "Met een temperatuur van {1} graden {2}, is het weer in {0} \"onbekend\", en de vochtigheidsgraad bedraagt {3} procent."
msgid "Current weather is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
-msgstr "Current weather is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
+msgstr "Het huidig weer is \"onbekend\" met een temperatuur van {1} graden {2}; De vochtigheidsgraad bedraagt {3} procent."
msgid "The weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
-msgstr "The weather is unknown with a temperature of {1} degrees {2}; The humidity level is {3} per cent."
+msgstr "Het weer is \"onbekend\" bij een temperatuur van {1} graden {2}; De vochtigheidsgraad bedraagt {3} procent."
msgid "The weather is currently unknown with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
-msgstr "The weather is currently unknown with a humidity of {3} per cent. The temperature is around {1} degrees {2};"
+msgstr "Het weer is op het ogenblik \"onbekend\" met een vochtigheidsgraad van {3} procent. De temperatuur bedraagt {1} graden {2};"
msgid "With a temperature of {1} degrees {2}, the weather is unknown, and the humidity level is {3} per cent."
-msgstr "With a temperature of {1} degrees {2}; the weather is unknown, and the humidity level is {3} per cent."
+msgstr "Bij een temperatuur van {1} graden {2}; is het weer \"onbekend\", en de vochtigheidsgraad bedraagt {3} percent."
msgid "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees."
msgstr "De weersverwachtingen voor morgen : "{0}" met temperaturen van {1} tot {2} graden."
msgid "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees."
-msgstr "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr "Morgen zal het weer {0} zijn met temperaturen tussen {1} en {2} graden."
msgid "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}."
-msgstr "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}."
+msgstr "Met temperaturen tussen {1} en {2} graden, is de weersverwachting voor morgen {0}."
msgid "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees."
-msgstr "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr "Morgen wordt er {0} weer verwacht bij een temperatuur tussen de {1} en {2} graden."
msgid "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
-msgstr "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
+msgstr "Het weer voor morgen, {0} bij temperaturen van {1} tot {2} graden."
msgid "http://www.google.com/ig/api?hl=en&weather=%s"
msgstr "http://www.google.com/ig/api?hl=nl&weather=%s"
@@ -90,13 +90,13 @@
msgstr "Locatie werd niet gevonden. Gelieve de ingegeven stadsnaam te controleren of een andere nabij gelegen stad in te geven."
msgid "Impossible to find the specified city name. Are you sure this city really exists ?"
-msgstr "Impossible to find the specified city name. Are you sure this city really exists ?"
+msgstr "Onmogelijk om de gespecifieerde stad te vinden. Ben je zeker dat deze stad echt bestaat ?"
msgid "The city you specified could not be found in my database. Make sure the city name exists, or specify another close by city name."
-msgstr "The city you specified could not be found in my database. Make sure the city name exists, or specify another close by city name."
+msgstr "De stad die je hebt ingegeven werd niet gevonden in mijn database. Controleer of de stadsnaam echt bestaat, of geef een andere nabijgelegen stad in."
msgid "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
-msgstr "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
+msgstr "Sorry, maar ik kan het weer niet opvragen voor de ingegeven locatie. Gelieve een andere nabijgelegen stad te proberen."
msgid "Start every x from full hour"
msgstr "Alarmen"
|
1 message has been excluded from this view by a project administrator.
