tux-droid-svn — Subversion commit reports.

[tuxdroid-svn] r5791 - in software_suite_v3/software/plugin/plugin-clock/trunk: resources sources/net/karmaLab/tuxDroid/plugins

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:35:12 +0100 (Thu, 29 Oct 2009)
New Revision: 5791

Modified:
   software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po
   software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po
   software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po
   software_suite_v3/software/plugin/plugin-clock/trunk/resources/nl.po
   software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot
   software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Merged r5644 through r5790 from random_sentences

Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po	2009-10-29 06:33:41 UTC (rev 5790)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po	2009-10-29 06:35:12 UTC (rev 5791)
@@ -7,15 +7,59 @@
 msgid "This plugin gives you the time."
 msgstr "Dieses Plugin sagt Ihnen die Zeit an."
 
-msgid "Current time is {0} hours and {1} minutes."
+msgid "It is {0} hours and {1} minutes."
 msgstr "Es ist {0} Uhr und {1} Minuten."
 
-msgid "Current time is {0} hours."
-msgstr "Jetzt ist es {0} Uhr."
+msgid "It is {0} hours {1}."
+msgstr "Es ist {0} Uhr {1}."
 
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr "Beim nächsten Beep ist es genau {0} Uhr {1} ... BEEP !"
+
+msgid "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
+msgstr "Beim nächsten Beep ist es genau {0} Uhr und {1} Minuten ... BEEP !"
+
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1} minutes"
+msgstr "Es ist {1} Uhr und {0} Minuten ... halt, Ich meine {0} Uhr und {1} Minuten"
+
+msgid "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+msgstr "Es ist {1} Uhr {0} ... halt, Ich meine {0} Uhr {1}."
+
+msgid "It is {0} o'clock"
+msgstr "Es ist {0} Uhr"
+
+msgid "It's exactly {0} hours"
+msgstr "Es ist genau {0} Uhr."
+
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr "Beim nächsten Beep ist es genau {0} Uhr ... BEEP !"
+
+msgid "At the next beep it will be {0} o'clock ... BEEP !"
+msgstr "Beim nächsten Beep ist es {0} Uhr ... BEEP !"
+
+msgid "It's midnight"
+msgstr "Es ist Mitternacht"
+
+msgid "It's noon"
+msgstr "Es ist Mittag"
+
+msgid "It's quarter past {0}"
+msgstr "Es ist Viertel nach {0}"
+
+msgid "It's a quarter after {0}"
+msgstr "Es ist Viertel nach {0}"
+
+msgid "It's quarter to {0}"
+msgstr "Es ist Viertel vor {0}"
+
+msgid "It's a quarter until {0}"
+msgstr "Es ist Viertel vor {0}"
+
+msgid "It's half past {0}"
+msgstr "Es ist halb {0}"
+
 msgid "Start every x from full hour"
 msgstr "Hinweise"
 
 msgid "Start me every x (From full hour)"
 msgstr "Sage die Zeit häufig an"
-

Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po	2009-10-29 06:33:41 UTC (rev 5790)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po	2009-10-29 06:35:12 UTC (rev 5791)
@@ -7,12 +7,75 @@
 msgid "This plugin gives you the time."
 msgstr "This plugin gives you the time."
 
-msgid "Current time is {0} hours and {1} minutes."
-msgstr "Current time is {0} hours and {1} minutes."
+msgid "It is {0} hours and {1} minutes."
+msgstr "It is {0} hours and {1} minutes."
 
-msgid "Current time is {0} hours."
-msgstr "Current time is {0} hours."
+msgid "It is {0} hours {1}."
+msgstr "It is {0} hours {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 !"
+
+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 !"
+
+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"
+
+msgid "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+msgstr "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+
+msgid "It is {0} o'clock"
+msgstr "It is {0} o'clock"
+
+msgid "It's exactly {0} hours"
+msgstr "It's exactly {0} hours"
+
+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 !"
+
+msgid "At the next beep it will be {0} o'clock ... BEEP !"
+msgstr "At the next beep it will be {0} o'clock ... BEEP !"
+
+msgid "It's midnight"
+msgstr "It's midnight"
+
+msgid "It's noon"
+msgstr "It's noon"
+
+msgid "It's quarter past {0}"
+msgstr "It's quarter past {0}"
+
+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/trunk/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po	2009-10-29 06:33:41 UTC (rev 5790)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po	2009-10-29 06:35:12 UTC (rev 5791)
@@ -7,12 +7,75 @@
 msgid "This plugin gives you the time."
 msgstr "Ce plugin vous donne l'heure."
 
-msgid "Current time is {0} hours and {1} minutes."
+msgid "It is {0} hours and {1} minutes."
 msgstr "Il est {0} heures et {1} minutes."
 
-msgid "Current time is {0} hours."
-msgstr "Il est {0} heures."
+msgid "It is {0} hours {1}."
+msgstr "Il est {0} heures {1}."
 
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr "Au prochain top, il sera exactement {0} heures {1} ... TOP !"
+
+msgid "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
+msgstr "Au prochain top, il sera {0} heures et {1} minutes ... TOP !"
+
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1} minutes"
+msgstr "Il est {1} heures et {0} minutes. euh ... {0} heures et {1} minutes"
+
+msgid "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+msgstr "Il est {1} heures {0}. euh ... {0} heures {1}."
+
+msgid "It is {0} o'clock"
+msgstr "Il est {0} heures"
+
+msgid "It's exactly {0} hours"
+msgstr "Il est exactement {0} heures."
+
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr "Au prochain top, il sera exactement {0} heures ... TOP !"
+
+msgid "At the next beep it will be {0} o'clock ... BEEP !"
+msgstr "Au prochain top, il sera {0} heures ... TOP !"
+
+msgid "It's midnight"
+msgstr "Il est minuit"
+
+msgid "It's noon"
+msgstr "Il est midi"
+
+msgid "It's quarter past {0}"
+msgstr "Il est {0} heures et quart"
+
+msgid "It's a quarter after {0}"
+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/trunk/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/nl.po	2009-10-29 06:33:41 UTC (rev 5790)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/nl.po	2009-10-29 06:35:12 UTC (rev 5791)
@@ -7,12 +7,57 @@
 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 "Current time is {0} hours."
-msgstr "Het is nu {0} uur."
+msgid "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 "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 "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 "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 "Het is {1} uur {0} ... Oeps, ik bedoel {0} uur {1}."
+
+msgid "It is {0} o'clock"
+msgstr "Het is kop {0} uur"
+
+msgid "It's exactly {0} hours"
+msgstr "Het is nu precies {0} uur."
+
+msgid "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 "Bij de volgende biep, is het {0} uur ... BIEP !"
+
+msgid "It's midnight"
+msgstr "Het is middernacht"
+
+msgid "It's noon"
+msgstr "Het is middag"
+
+msgid "It's quarter past {0}"
+msgstr "Het is kwart na {0}"
+
+msgid "It's a quarter after {0}"
+msgstr "Het is kwart over {0}"
+
+msgid "It's quarter to {0}"
+msgstr "Het is kwart voor {0}"
+
+msgid "It's a quarter until {0}"
+msgstr "Het is kwart voor {0}"
+
+msgid "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/trunk/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot	2009-10-29 06:33:41 UTC (rev 5790)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/plugin.pot	2009-10-29 06:35:12 UTC (rev 5791)
@@ -1,20 +1,83 @@
-msgid "Clock"
-msgstr ""
-
-msgid "Clock."
-msgstr ""
-
-msgid "This plugin gives you the time."
-msgstr ""
-
-msgid "Current time is {0} hours and {1} minutes."
-msgstr ""
-
-msgid "Current time is {0} hours."
-msgstr ""
-
-msgid "Start every x from full hour"
-msgstr ""
-
-msgid "Start me every x (From full hour)"
+msgid "Clock"
 msgstr ""
+
+msgid "Clock."
+msgstr ""
+
+msgid "This plugin gives you the time."
+msgstr ""
+
+msgid "It is {0} hours and {1} minutes."
+msgstr ""
+
+msgid "It is {0} hours {1}."
+msgstr ""
+
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr ""
+
+msgid "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
+msgstr ""
+
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1} minutes"
+msgstr ""
+
+msgid "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+msgstr ""
+
+msgid "It is {0} o'clock"
+msgstr ""
+
+msgid "It's exactly {0} hours"
+msgstr ""
+
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr ""
+
+msgid "At the next beep it will be {0} o'clock ... BEEP !"
+msgstr ""
+
+msgid "It's midnight"
+msgstr ""
+
+msgid "It's noon"
+msgstr ""
+
+msgid "It's quarter past {0}"
+msgstr ""
+
+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 ""
+
+msgid "Start me every x (From full hour)"
+msgstr ""

Modified: software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java	2009-10-29 06:33:41 UTC (rev 5790)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java	2009-10-29 06:35:12 UTC (rev 5791)
@@ -25,51 +25,152 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.Random;
 
 import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
 import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration;
 
 public class ClockPlugin extends SimplePlugin<SimplePluginConfiguration> {
 
-	/**
-	 * Main gadget access point.
-	 *
-	 * @param args
-	 *            commands
-	 * @throws Exception
-	 *             errors
-	 */
-	public static void main(String[] args) throws Exception {
-		new ClockPlugin().boot(args, new SimplePluginConfiguration());
-	}
+    /**
+     * Main gadget access point.
+     *
+     * @param args
+     *            commands
+     * @throws Exception
+     *             errors
+     */
 
-	private final Calendar calendar = new GregorianCalendar();
+    String[] normalSentences = {
+        "It is {0} hours and {1} minutes.",
+        "It is {0} hours {1}.",
+        "At the next beep it will be exactly {0} hours {1} ... BEEP !",
+        "At the next beep it will be {0} hours and {1} minutes ... BEEP !",
+        "It's {1} hours and {0} minutes ... oops, I mean {0} hours and {1} minutes",
+        "It's {1} hours {0} ... oops, I mean {0} hours {1}."
+    };
+    String[] sharpSentences = {
+        "It is {0} o'clock",
+        "It's exactly {0} hours",
+        "At the next beep it will be exactly {0} o'clock ... BEEP !",
+        "At the next beep it will be {0} o'clock ... BEEP !"
+    };
 
-	@Override
-	public void start() {
-		if (getCommand().equals("run")) {
-			run();
-		}
-		else {
-			run();
-		}
-	}
+    public static void main(String[] args) throws Exception {
+        new ClockPlugin().boot(args, new SimplePluginConfiguration());
+    }
 
-	private void run() {
-		calendar.setTime(new Date());
-		int h = calendar.get(Calendar.HOUR_OF_DAY);
-		int m = calendar.get(Calendar.MINUTE);
-		if (m != 0) {
-			throwMessage("Current time is {0} hours and {1} minutes.", h, m);
-		} else {
-			throwMessage("Current time is {0} hours.", h);
-		}
-	}
+    private final Calendar calendar = new GregorianCalendar();
 
     @Override
+        public void start() {
+            if (getCommand().equals("run")) {
+                run();
+            }
+            else {
+                run();
+            }
+        }
+
+    private void run() {
+        calendar.setTime(new Date());
+        int h = calendar.get(Calendar.HOUR_OF_DAY);
+        int m = calendar.get(Calendar.MINUTE);
+
+        Random rand = new Random();
+        Boolean random = rand.nextBoolean();
+        String language = configuration().getLanguage();
+
+        if (m == 0) {
+            if (h == 0) {
+                throwMessage("It's midnight");
+            }
+            else if (h == 12) {
+                throwMessage("It's noon");
+            }
+            else {
+                throwMessage(this.pickSentence(sharpSentences), h);
+            }
+        }
+        else if (m == 15) {
+            if (h == 0 && !(language.equals("nl") || language.equals("de"))) 
+            {
+                throwMessage("It's quarter past midnight");
+            }
+            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) {
+            if (language.equals("nl") || language.equals("de")) {
+                throwMessage("It's half past {0}", h+1);
+            }
+            else {
+                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 (h == 23 && !(language.equals("nl") || language.equals("de"))) 
+            {
+                throwMessage("It's quarter to midnight");
+            }
+            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);
+        }
+    }
+
+    private String pickSentence(String[] list) {
+        Random rand = new Random();
+        return list[rand.nextInt(list.length)];
+    }
+
+    @Override
     public void onPluginStop() {
     }
-    
+
     @Override
     public void onPluginEvent(String eventName, String[] eventValues) {
     }

[tuxdroid-svn] r5805 - software_suite_v3/software/plugin/plugin-programsTv/trunk

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 08:00:27 +0100 (Thu, 29 Oct 2009)
New Revision: 5805

Removed:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/
Log:
* Removed the empty dir

[tuxdroid-svn] r5804 - in software_suite_v3/software/plugin/plugin-programsTv/trunk: . plugin-programsTv

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:59:22 +0100 (Thu, 29 Oct 2009)
New Revision: 5804

Added:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/pom.xml
   software_suite_v3/software/plugin/plugin-programsTv/trunk/resources/
   software_suite_v3/software/plugin/plugin-programsTv/trunk/src/
Removed:
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/pom.xml
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/
   software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/
Log:
* Removed the subdir in the project root

Deleted: software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/pom.xml	2009-10-29 06:58:51 UTC (rev 5803)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/pom.xml	2009-10-29 06:59:22 UTC (rev 5804)
@@ -1,116 +0,0 @@
-<project>
-    <!--General project informations-->
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.kysoh</groupId>
-    <artifactId>plugin-programsTv</artifactId>
-    <packaging>jar</packaging>
-    <version>3.0</version>
-    <name>ProgramsTv plugin for Tux Droid</name>
-    <url>http://www.kysoh.com</url>
-    
-    <!--Dependency list-->
-    <dependencies>
-	<dependency>
-	    <groupId>com.kysoh</groupId>
-	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
-	    <version>0.0.3</version>
-	</dependency>
-    </dependencies>
-    
-    <!--Repository list-->
-    <repositories>
-	<repository>
-	    <id>kysoh</id>
-	    <name>Kysoh Repository</name>
-	    <layout>default</layout>
-	    <url>http://ftp.kysoh.com/maven2</url>
-	    <snapshots>
-		<enabled>false</enabled>
-	    </snapshots>
-	</repository>
-    </repositories>
-
-    <!--Build process-->
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <plugins>
-
-            <!--This section copy the dependencies into ./libraries-->
-            <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>copy-dependencies</id>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>copy-dependencies</goal>
-                    </goals>
-                    <configuration>
-                        <outputDirectory>./libraries</outputDirectory>
-                    </configuration>
-                </execution>
-            </executions>
-            </plugin>
-
-            <!--This plugin run small ant scripts to pack and clean the gadget -->
-            <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.3</version>
-            <executions>
-
-                <!--This section create the .tgf file during the package lifecycle-->
-                <execution>
-                <phase>package</phase>
-                <id>package</id>
-                <configuration>
-                    <tasks>
-                        <mkdir dir="./libraries"/>
-                        <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
-                            todir="./libraries" />
-                        <zip destfile="./${project.artifactId}.scp">
-                            <zipfileset dir="." includes="resources/*" />
-                            <zipfileset dir="." includes="resources/attitunes/*" />
-                            <zipfileset dir="." includes="libraries/*" >
-                                <exclude name="libraries/tuxdroid-plugin-java-kit*" />
-                                <exclude name="libraries/karmalab-commons*" />
-                                <exclude name="libraries/tuxdroid-java-api*" />
-                            </zipfileset>
-                            <zipfileset dir="." includes="executables/*" />
-                        </zip>
-                    </tasks>
-                </configuration>
-                <goals>
-                    <goal>run</goal>
-                </goals>
-                </execution>
-
-                <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
-                <execution>
-                <phase>clean</phase>
-                <configuration>
-                    <tasks>
-                        <delete dir="./libraries"/>
-                        <delete file="./${project.artifactId}.scp"/>
-                    </tasks>
-                </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-            </plugin>
-
-            <!--This plugin compile the project-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

Copied: software_suite_v3/software/plugin/plugin-programsTv/trunk/pom.xml (from rev 5786, software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/pom.xml)
===================================================================
--- software_suite_v3/software/plugin/plugin-programsTv/trunk/pom.xml	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-programsTv/trunk/pom.xml	2009-10-29 06:59:22 UTC (rev 5804)
@@ -0,0 +1,116 @@
+<project>
+    <!--General project informations-->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.kysoh</groupId>
+    <artifactId>plugin-programsTv</artifactId>
+    <packaging>jar</packaging>
+    <version>3.0</version>
+    <name>ProgramsTv plugin for Tux Droid</name>
+    <url>http://www.kysoh.com</url>
+    
+    <!--Dependency list-->
+    <dependencies>
+	<dependency>
+	    <groupId>com.kysoh</groupId>
+	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
+	    <version>0.0.3</version>
+	</dependency>
+    </dependencies>
+    
+    <!--Repository list-->
+    <repositories>
+	<repository>
+	    <id>kysoh</id>
+	    <name>Kysoh Repository</name>
+	    <layout>default</layout>
+	    <url>http://ftp.kysoh.com/maven2</url>
+	    <snapshots>
+		<enabled>false</enabled>
+	    </snapshots>
+	</repository>
+    </repositories>
+
+    <!--Build process-->
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+
+            <!--This section copy the dependencies into ./libraries-->
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+                <execution>
+                    <id>copy-dependencies</id>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>copy-dependencies</goal>
+                    </goals>
+                    <configuration>
+                        <outputDirectory>./libraries</outputDirectory>
+                    </configuration>
+                </execution>
+            </executions>
+            </plugin>
+
+            <!--This plugin run small ant scripts to pack and clean the gadget -->
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.3</version>
+            <executions>
+
+                <!--This section create the .tgf file during the package lifecycle-->
+                <execution>
+                <phase>package</phase>
+                <id>package</id>
+                <configuration>
+                    <tasks>
+                        <mkdir dir="./libraries"/>
+                        <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+                            todir="./libraries" />
+                        <zip destfile="./${project.artifactId}.scp">
+                            <zipfileset dir="." includes="resources/*" />
+                            <zipfileset dir="." includes="resources/attitunes/*" />
+                            <zipfileset dir="." includes="libraries/*" >
+                                <exclude name="libraries/tuxdroid-plugin-java-kit*" />
+                                <exclude name="libraries/karmalab-commons*" />
+                                <exclude name="libraries/tuxdroid-java-api*" />
+                            </zipfileset>
+                            <zipfileset dir="." includes="executables/*" />
+                        </zip>
+                    </tasks>
+                </configuration>
+                <goals>
+                    <goal>run</goal>
+                </goals>
+                </execution>
+
+                <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
+                <execution>
+                <phase>clean</phase>
+                <configuration>
+                    <tasks>
+                        <delete dir="./libraries"/>
+                        <delete file="./${project.artifactId}.scp"/>
+                    </tasks>
+                </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+            </plugin>
+
+            <!--This plugin compile the project-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Copied: software_suite_v3/software/plugin/plugin-programsTv/trunk/resources (from rev 5786, software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources)

Copied: software_suite_v3/software/plugin/plugin-programsTv/trunk/src (from rev 5786, software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src)

[tuxdroid-svn] r5803 - software_suite_v3/software/plugin/plugin-shortcut/trunk

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:58:51 +0100 (Thu, 29 Oct 2009)
New Revision: 5803

Removed:
   software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/
Log:
* Removed the empty dir

[tuxdroid-svn] r5802 - in software_suite_v3/software/plugin/plugin-shortcut/trunk: . plugin-shortcut

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:58:35 +0100 (Thu, 29 Oct 2009)
New Revision: 5802

Added:
   software_suite_v3/software/plugin/plugin-shortcut/trunk/LICENSE
   software_suite_v3/software/plugin/plugin-shortcut/trunk/pom.xml
   software_suite_v3/software/plugin/plugin-shortcut/trunk/resources/
   software_suite_v3/software/plugin/plugin-shortcut/trunk/src/
Removed:
   software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/LICENSE
   software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml
   software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources/
   software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/src/
Log:
* Removed the subdir in the project root

Copied: software_suite_v3/software/plugin/plugin-shortcut/trunk/LICENSE (from rev 5786, software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/LICENSE)
===================================================================
--- software_suite_v3/software/plugin/plugin-shortcut/trunk/LICENSE	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-shortcut/trunk/LICENSE	2009-10-29 06:58:35 UTC (rev 5802)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
+Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/LICENSE
===================================================================
--- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/LICENSE	2009-10-29 06:58:13 UTC (rev 5801)
+++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/LICENSE	2009-10-29 06:58:35 UTC (rev 5802)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
-Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml	2009-10-29 06:58:13 UTC (rev 5801)
+++ software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml	2009-10-29 06:58:35 UTC (rev 5802)
@@ -1,116 +0,0 @@
-<project>
-    <!--General project informations-->
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.kysoh</groupId>
-    <artifactId>plugin-shortcut</artifactId>
-    <packaging>jar</packaging>
-    <version>3.0</version>
-    <name>Shortcut launcher for Tux Droid</name>
-    <url>http://www.tuxisalive.com</url>
-    
-    <!--Dependency list-->
-    <dependencies>
-	<dependency>
-	    <groupId>com.kysoh</groupId>
-	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
-	    <version>0.0.3</version>
-	</dependency>
-    </dependencies>
-    
-    <!--Repository list-->
-    <repositories>
-	<repository>
-	    <id>kysoh</id>
-	    <name>Kysoh Repository</name>
-	    <layout>default</layout>
-	    <url>http://ftp.kysoh.com/maven2</url>
-	    <snapshots>
-		<enabled>false</enabled>
-	    </snapshots>
-	</repository>
-    </repositories>
-
-    <!--Build process-->
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-	<plugins>
-
-	    <!--This section copy the dependencies into ./libraries-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-dependency-plugin</artifactId>
-		<executions>
-		    <execution>
-			<id>copy-dependencies</id>
-			<phase>package</phase>
-			<goals>
-			    <goal>copy-dependencies</goal>
-			</goals>
-			<configuration>
-			    <outputDirectory>./libraries</outputDirectory>
-			</configuration>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin run small ant scripts to pack and clean the plugin -->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-antrun-plugin</artifactId>
-		<version>1.3</version>
-		<executions>
-		    
-		    <!--This section create the .tgf file during the package lifecycle-->
-		    <execution>
-			<phase>package</phase>
-			<id>package</id>
-			<configuration>
-			    <tasks>
-				<mkdir dir="./libraries"/>
-				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
-				    todir="./libraries" />
-				<zip destfile="./${project.artifactId}.scp">
-                    <zipfileset dir="." includes="resources/*" />
-                    <zipfileset dir="." includes="resources/attitunes/*" />
-                    <zipfileset dir="." includes="libraries/*" >
-                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
-                        <exclude name="libraries/karmalab-commons*" />
-                        <exclude name="libraries/tuxdroid-java-api*" />
-                    </zipfileset>
-                    <zipfileset dir="." includes="executables/*" />
-                </zip>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-
-		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
-		    <execution>
-			<phase>clean</phase>
-			<configuration>
-			    <tasks>
-				<delete dir="./libraries"/>
-				<delete file="./${project.artifactId}.scp"/>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin compile the project-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		    <source>1.6</source>
-		    <target>1.6</target>
-		</configuration>
-	    </plugin>
-	</plugins>
-    </build>
-</project>

Copied: software_suite_v3/software/plugin/plugin-shortcut/trunk/pom.xml (from rev 5786, software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/pom.xml)
===================================================================
--- software_suite_v3/software/plugin/plugin-shortcut/trunk/pom.xml	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-shortcut/trunk/pom.xml	2009-10-29 06:58:35 UTC (rev 5802)
@@ -0,0 +1,116 @@
+<project>
+    <!--General project informations-->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.kysoh</groupId>
+    <artifactId>plugin-shortcut</artifactId>
+    <packaging>jar</packaging>
+    <version>3.0</version>
+    <name>Shortcut launcher for Tux Droid</name>
+    <url>http://www.tuxisalive.com</url>
+    
+    <!--Dependency list-->
+    <dependencies>
+	<dependency>
+	    <groupId>com.kysoh</groupId>
+	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
+	    <version>0.0.3</version>
+	</dependency>
+    </dependencies>
+    
+    <!--Repository list-->
+    <repositories>
+	<repository>
+	    <id>kysoh</id>
+	    <name>Kysoh Repository</name>
+	    <layout>default</layout>
+	    <url>http://ftp.kysoh.com/maven2</url>
+	    <snapshots>
+		<enabled>false</enabled>
+	    </snapshots>
+	</repository>
+    </repositories>
+
+    <!--Build process-->
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+	<plugins>
+
+	    <!--This section copy the dependencies into ./libraries-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-dependency-plugin</artifactId>
+		<executions>
+		    <execution>
+			<id>copy-dependencies</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>copy-dependencies</goal>
+			</goals>
+			<configuration>
+			    <outputDirectory>./libraries</outputDirectory>
+			</configuration>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin run small ant scripts to pack and clean the plugin -->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-antrun-plugin</artifactId>
+		<version>1.3</version>
+		<executions>
+		    
+		    <!--This section create the .tgf file during the package lifecycle-->
+		    <execution>
+			<phase>package</phase>
+			<id>package</id>
+			<configuration>
+			    <tasks>
+				<mkdir dir="./libraries"/>
+				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+				    todir="./libraries" />
+				<zip destfile="./${project.artifactId}.scp">
+                    <zipfileset dir="." includes="resources/*" />
+                    <zipfileset dir="." includes="resources/attitunes/*" />
+                    <zipfileset dir="." includes="libraries/*" >
+                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
+                        <exclude name="libraries/karmalab-commons*" />
+                        <exclude name="libraries/tuxdroid-java-api*" />
+                    </zipfileset>
+                    <zipfileset dir="." includes="executables/*" />
+                </zip>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+
+		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
+		    <execution>
+			<phase>clean</phase>
+			<configuration>
+			    <tasks>
+				<delete dir="./libraries"/>
+				<delete file="./${project.artifactId}.scp"/>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin compile the project-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<configuration>
+		    <source>1.6</source>
+		    <target>1.6</target>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
+</project>

Copied: software_suite_v3/software/plugin/plugin-shortcut/trunk/resources (from rev 5786, software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/resources)

Copied: software_suite_v3/software/plugin/plugin-shortcut/trunk/src (from rev 5786, software_suite_v3/software/plugin/plugin-shortcut/trunk/plugin-shortcut/src)

[tuxdroid-svn] r5801 - software_suite_v3/software/plugin/plugin-system/trunk

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:58:13 +0100 (Thu, 29 Oct 2009)
New Revision: 5801

Removed:
   software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/
Log:
* Removed the empty dir

[tuxdroid-svn] r5800 - in software_suite_v3/software/plugin/plugin-system/trunk: . plugin-system

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:57:56 +0100 (Thu, 29 Oct 2009)
New Revision: 5800

Added:
   software_suite_v3/software/plugin/plugin-system/trunk/LICENSE
   software_suite_v3/software/plugin/plugin-system/trunk/build.py
   software_suite_v3/software/plugin/plugin-system/trunk/builder/
   software_suite_v3/software/plugin/plugin-system/trunk/executables/
   software_suite_v3/software/plugin/plugin-system/trunk/resources/
Removed:
   software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/LICENSE
   software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/build.py
   software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/builder/
   software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables/
   software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources/
Log:
* Removed the subdir in the project root

Copied: software_suite_v3/software/plugin/plugin-system/trunk/LICENSE (from rev 5786, software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/LICENSE)
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/LICENSE	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-system/trunk/LICENSE	2009-10-29 06:57:56 UTC (rev 5800)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
+Public License instead of this License.

Copied: software_suite_v3/software/plugin/plugin-system/trunk/build.py (from rev 5786, software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/build.py)
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/build.py	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-system/trunk/build.py	2009-10-29 06:57:56 UTC (rev 5800)
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright (C) 2009 C2ME Sa
+#    Remi Jocaille <rem...@c2...>
+#    Distributed under the terms of the GNU General Public License
+#    http://www.gnu.org/copyleft/gpl.html
+
+from builder.PluginPackager import PluginPackager
+
+if __name__ == "__main__":
+    PluginPackager().createScp("plugin-system.scp")

Copied: software_suite_v3/software/plugin/plugin-system/trunk/builder (from rev 5786, software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/builder)

Copied: software_suite_v3/software/plugin/plugin-system/trunk/executables (from rev 5786, software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/executables)

Deleted: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/LICENSE
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/LICENSE	2009-10-29 06:57:01 UTC (rev 5799)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/LICENSE	2009-10-29 06:57:56 UTC (rev 5800)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
-Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/build.py
===================================================================
--- software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/build.py	2009-10-29 06:57:01 UTC (rev 5799)
+++ software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/build.py	2009-10-29 06:57:56 UTC (rev 5800)
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright (C) 2009 C2ME Sa
-#    Remi Jocaille <rem...@c2...>
-#    Distributed under the terms of the GNU General Public License
-#    http://www.gnu.org/copyleft/gpl.html
-
-from builder.PluginPackager import PluginPackager
-
-if __name__ == "__main__":
-    PluginPackager().createScp("plugin-system.scp")

Copied: software_suite_v3/software/plugin/plugin-system/trunk/resources (from rev 5786, software_suite_v3/software/plugin/plugin-system/trunk/plugin-system/resources)

[tuxdroid-svn] r5799 - software_suite_v3/software/plugin/plugin-totem/trunk

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:57:01 +0100 (Thu, 29 Oct 2009)
New Revision: 5799

Removed:
   software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/
Log:
* Removed the empty dir

[tuxdroid-svn] r5798 - in software_suite_v3/software/plugin/plugin-totem/trunk: . plugin-totem

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:56:38 +0100 (Thu, 29 Oct 2009)
New Revision: 5798

Added:
   software_suite_v3/software/plugin/plugin-totem/trunk/LICENSE
   software_suite_v3/software/plugin/plugin-totem/trunk/pom.xml
   software_suite_v3/software/plugin/plugin-totem/trunk/resources/
   software_suite_v3/software/plugin/plugin-totem/trunk/src/
Removed:
   software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/LICENSE
   software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/pom.xml
   software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources/
   software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/src/
Log:
* Removed the subdir in the project root

Copied: software_suite_v3/software/plugin/plugin-totem/trunk/LICENSE (from rev 5786, software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/LICENSE)
===================================================================
--- software_suite_v3/software/plugin/plugin-totem/trunk/LICENSE	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-totem/trunk/LICENSE	2009-10-29 06:56:38 UTC (rev 5798)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
+Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/LICENSE
===================================================================
--- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/LICENSE	2009-10-29 06:56:06 UTC (rev 5797)
+++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/LICENSE	2009-10-29 06:56:38 UTC (rev 5798)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
-Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/pom.xml	2009-10-29 06:56:06 UTC (rev 5797)
+++ software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/pom.xml	2009-10-29 06:56:38 UTC (rev 5798)
@@ -1,113 +0,0 @@
-<project>
-    <!--General project informations-->
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.kysoh</groupId>
-    <artifactId>plugin-totem</artifactId>
-    <packaging>jar</packaging>
-    <version>3.0</version>
-    <name>Totem player for Tux Droid</name>
-    <url>http://www.tuxisalive.com</url>
-    
-    <!--Dependency list-->
-    <dependencies>
-	<dependency>
-	    <groupId>com.kysoh</groupId>
-	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
-	    <version>0.0.3</version>
-	</dependency>
-    </dependencies>
-    
-    <!--Repository list-->
-    <repositories>
-	<repository>
-	    <id>kysoh</id>
-	    <name>Kysoh Repository</name>
-	    <layout>default</layout>
-	    <url>http://ftp.kysoh.com/maven2</url>
-	    <snapshots>
-		<enabled>false</enabled>
-	    </snapshots>
-	</repository>
-    </repositories>
-
-    <!--Build process-->
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-	<plugins>
-
-	    <!--This section copy the dependencies into ./libraries-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-dependency-plugin</artifactId>
-		<executions>
-		    <execution>
-			<id>copy-dependencies</id>
-			<phase>package</phase>
-			<goals>
-			    <goal>copy-dependencies</goal>
-			</goals>
-			<configuration>
-			    <outputDirectory>./libraries</outputDirectory>
-			</configuration>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin run small ant scripts to pack and clean the plugin -->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-antrun-plugin</artifactId>
-		<version>1.3</version>
-		<executions>
-		    
-		    <!--This section create the .scp file during the package lifecycle-->
-		    <execution>
-			<phase>package</phase>
-			<id>package</id>
-			<configuration>
-			    <tasks>
-				<mkdir dir="./libraries"/>
-				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
-				    todir="./libraries" />
-				<zip destfile="./${project.artifactId}.scp">
-				    <zipfileset dir="." includes="resources/*" />
-				    <zipfileset dir="." includes="libraries/*" >
-                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
-                    </zipfileset>
-				    <zipfileset dir="." includes="executables/*" />
-				</zip>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-
-		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
-		    <execution>
-			<phase>clean</phase>
-			<configuration>
-			    <tasks>
-				<delete dir="./libraries"/>
-				<delete file="./${project.artifactId}.scp"/>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin compile the project-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		    <source>1.6</source>
-		    <target>1.6</target>
-		</configuration>
-	    </plugin>
-	</plugins>
-    </build>
-</project>

Copied: software_suite_v3/software/plugin/plugin-totem/trunk/pom.xml (from rev 5786, software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/pom.xml)
===================================================================
--- software_suite_v3/software/plugin/plugin-totem/trunk/pom.xml	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-totem/trunk/pom.xml	2009-10-29 06:56:38 UTC (rev 5798)
@@ -0,0 +1,113 @@
+<project>
+    <!--General project informations-->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.kysoh</groupId>
+    <artifactId>plugin-totem</artifactId>
+    <packaging>jar</packaging>
+    <version>3.0</version>
+    <name>Totem player for Tux Droid</name>
+    <url>http://www.tuxisalive.com</url>
+    
+    <!--Dependency list-->
+    <dependencies>
+	<dependency>
+	    <groupId>com.kysoh</groupId>
+	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
+	    <version>0.0.3</version>
+	</dependency>
+    </dependencies>
+    
+    <!--Repository list-->
+    <repositories>
+	<repository>
+	    <id>kysoh</id>
+	    <name>Kysoh Repository</name>
+	    <layout>default</layout>
+	    <url>http://ftp.kysoh.com/maven2</url>
+	    <snapshots>
+		<enabled>false</enabled>
+	    </snapshots>
+	</repository>
+    </repositories>
+
+    <!--Build process-->
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+	<plugins>
+
+	    <!--This section copy the dependencies into ./libraries-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-dependency-plugin</artifactId>
+		<executions>
+		    <execution>
+			<id>copy-dependencies</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>copy-dependencies</goal>
+			</goals>
+			<configuration>
+			    <outputDirectory>./libraries</outputDirectory>
+			</configuration>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin run small ant scripts to pack and clean the plugin -->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-antrun-plugin</artifactId>
+		<version>1.3</version>
+		<executions>
+		    
+		    <!--This section create the .scp file during the package lifecycle-->
+		    <execution>
+			<phase>package</phase>
+			<id>package</id>
+			<configuration>
+			    <tasks>
+				<mkdir dir="./libraries"/>
+				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+				    todir="./libraries" />
+				<zip destfile="./${project.artifactId}.scp">
+				    <zipfileset dir="." includes="resources/*" />
+				    <zipfileset dir="." includes="libraries/*" >
+                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
+                    </zipfileset>
+				    <zipfileset dir="." includes="executables/*" />
+				</zip>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+
+		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
+		    <execution>
+			<phase>clean</phase>
+			<configuration>
+			    <tasks>
+				<delete dir="./libraries"/>
+				<delete file="./${project.artifactId}.scp"/>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin compile the project-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<configuration>
+		    <source>1.6</source>
+		    <target>1.6</target>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
+</project>

Copied: software_suite_v3/software/plugin/plugin-totem/trunk/resources (from rev 5786, software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/resources)

Copied: software_suite_v3/software/plugin/plugin-totem/trunk/src (from rev 5786, software_suite_v3/software/plugin/plugin-totem/trunk/plugin-totem/src)

[tuxdroid-svn] r5797 - software_suite_v3/software/plugin/plugin-twitter/trunk

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:56:06 +0100 (Thu, 29 Oct 2009)
New Revision: 5797

Removed:
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/
Log:
* Removed the empty dir

[tuxdroid-svn] r5796 - in software_suite_v3/software/plugin/plugin-twitter/trunk: . plugin-twitter

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:55:47 +0100 (Thu, 29 Oct 2009)
New Revision: 5796

Added:
   software_suite_v3/software/plugin/plugin-twitter/trunk/LICENSE
   software_suite_v3/software/plugin/plugin-twitter/trunk/pom.xml
   software_suite_v3/software/plugin/plugin-twitter/trunk/resources/
   software_suite_v3/software/plugin/plugin-twitter/trunk/src/
Removed:
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/LICENSE
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/
Log:
* Removed the subdir in the project root 


Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/LICENSE (from rev 5795, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/LICENSE)
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/LICENSE	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/LICENSE	2009-10-29 06:55:47 UTC (rev 5796)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
+Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/LICENSE
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/LICENSE	2009-10-29 06:54:43 UTC (rev 5795)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/LICENSE	2009-10-29 06:55:47 UTC (rev 5796)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
-Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml	2009-10-29 06:54:43 UTC (rev 5795)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml	2009-10-29 06:55:47 UTC (rev 5796)
@@ -1,119 +0,0 @@
-<project>
-    <!--General project informations-->
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.kysoh</groupId>
-    <artifactId>plugin-twitter</artifactId>
-    <packaging>jar</packaging>
-    <version>4.0</version>
-    <name>Twitter plugin for Tux Droid</name>
-    <url>http://www.tuxisalive.com</url>
-    
-    <!--Dependency list-->
-    <dependencies>
-	<dependency>
-	    <groupId>com.kysoh</groupId>
-	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
-	    <version>0.0.3</version>
-	</dependency>
-	<dependency>
-	    <groupId>jtwitter</groupId>
-	    <artifactId>jtwitter</artifactId>
-	    <version>0.9.8</version>
-	</dependency>
-    </dependencies>
-    
-    <!--Repository list-->
-    <repositories>
-	<repository>
-	    <id>kysoh</id>
-	    <name>Kysoh Repository</name>
-	    <layout>default</layout>
-	    <url>http://ftp.kysoh.com/maven2</url>
-	    <snapshots>
-		<enabled>false</enabled>
-	    </snapshots>
-	</repository>
-    </repositories>
-
-    <!--Build process-->
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-	<plugins>
-
-	    <!--This section copy the dependencies into ./libraries-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-dependency-plugin</artifactId>
-		<executions>
-		    <execution>
-			<id>copy-dependencies</id>
-			<phase>package</phase>
-			<goals>
-			    <goal>copy-dependencies</goal>
-			</goals>
-			<configuration>
-			    <outputDirectory>./libraries</outputDirectory>
-			</configuration>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin run small ant scripts to pack and clean the plugin-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-antrun-plugin</artifactId>
-		<version>1.3</version>
-		<executions>
-		    
-		    <!--This section create the .scp file during the package lifecycle-->
-		    <execution>
-			<phase>package</phase>
-			<id>package</id>
-			<configuration>
-			    <tasks>
-				<mkdir dir="./libraries"/>
-				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
-				    todir="./libraries" />
-				<zip destfile="./${project.artifactId}.scp">
-				    <zipfileset dir="." includes="resources/*" />
-                    <zipfileset dir="." includes="resources/attitunes/*" />
-				    <zipfileset dir="." includes="libraries/*" >
-                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
-                    </zipfileset>
-				    <zipfileset dir="." includes="executables/*" />
-				</zip>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-
-		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
-		    <execution>
-			<phase>clean</phase>
-			<configuration>
-			    <tasks>
-				<delete dir="./libraries"/>
-				<delete file="./${project.artifactId}.scp"/>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin compile the project-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		    <source>1.6</source>
-		    <target>1.6</target>
-		</configuration>
-	    </plugin>
-	</plugins>
-    </build>
-</project>

Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/pom.xml (from rev 5795, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/pom.xml)
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/pom.xml	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/pom.xml	2009-10-29 06:55:47 UTC (rev 5796)
@@ -0,0 +1,119 @@
+<project>
+    <!--General project informations-->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.kysoh</groupId>
+    <artifactId>plugin-twitter</artifactId>
+    <packaging>jar</packaging>
+    <version>4.0</version>
+    <name>Twitter plugin for Tux Droid</name>
+    <url>http://www.tuxisalive.com</url>
+    
+    <!--Dependency list-->
+    <dependencies>
+	<dependency>
+	    <groupId>com.kysoh</groupId>
+	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
+	    <version>0.0.3</version>
+	</dependency>
+	<dependency>
+	    <groupId>jtwitter</groupId>
+	    <artifactId>jtwitter</artifactId>
+	    <version>0.9.8</version>
+	</dependency>
+    </dependencies>
+    
+    <!--Repository list-->
+    <repositories>
+	<repository>
+	    <id>kysoh</id>
+	    <name>Kysoh Repository</name>
+	    <layout>default</layout>
+	    <url>http://ftp.kysoh.com/maven2</url>
+	    <snapshots>
+		<enabled>false</enabled>
+	    </snapshots>
+	</repository>
+    </repositories>
+
+    <!--Build process-->
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+	<plugins>
+
+	    <!--This section copy the dependencies into ./libraries-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-dependency-plugin</artifactId>
+		<executions>
+		    <execution>
+			<id>copy-dependencies</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>copy-dependencies</goal>
+			</goals>
+			<configuration>
+			    <outputDirectory>./libraries</outputDirectory>
+			</configuration>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin run small ant scripts to pack and clean the plugin-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-antrun-plugin</artifactId>
+		<version>1.3</version>
+		<executions>
+		    
+		    <!--This section create the .scp file during the package lifecycle-->
+		    <execution>
+			<phase>package</phase>
+			<id>package</id>
+			<configuration>
+			    <tasks>
+				<mkdir dir="./libraries"/>
+				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+				    todir="./libraries" />
+				<zip destfile="./${project.artifactId}.scp">
+				    <zipfileset dir="." includes="resources/*" />
+                    <zipfileset dir="." includes="resources/attitunes/*" />
+				    <zipfileset dir="." includes="libraries/*" >
+                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
+                    </zipfileset>
+				    <zipfileset dir="." includes="executables/*" />
+				</zip>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+
+		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
+		    <execution>
+			<phase>clean</phase>
+			<configuration>
+			    <tasks>
+				<delete dir="./libraries"/>
+				<delete file="./${project.artifactId}.scp"/>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin compile the project-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<configuration>
+		    <source>1.6</source>
+		    <target>1.6</target>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
+</project>

Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/resources (from rev 5795, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources)

Copied: software_suite_v3/software/plugin/plugin-twitter/trunk/src (from rev 5795, software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src)

[tuxdroid-svn] r5795 - software_suite_v3/software/plugin/plugin-weather/trunk

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:54:43 +0100 (Thu, 29 Oct 2009)
New Revision: 5795

Removed:
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/
Log:
* Removed the empty dir

[tuxdroid-svn] r5794 - in software_suite_v3/software/plugin/plugin-weather/trunk: . plugin-weather

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:52:37 +0100 (Thu, 29 Oct 2009)
New Revision: 5794

Added:
   software_suite_v3/software/plugin/plugin-weather/trunk/LICENSE
   software_suite_v3/software/plugin/plugin-weather/trunk/pom.xml
   software_suite_v3/software/plugin/plugin-weather/trunk/resources/
   software_suite_v3/software/plugin/plugin-weather/trunk/src/
Removed:
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/LICENSE
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/src/
Log:
* Removed the subdir in the project root


Copied: software_suite_v3/software/plugin/plugin-weather/trunk/LICENSE (from rev 5793, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/LICENSE)
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/LICENSE	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/LICENSE	2009-10-29 06:52:37 UTC (rev 5794)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
+Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/LICENSE
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/LICENSE	2009-10-29 06:37:00 UTC (rev 5793)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/LICENSE	2009-10-29 06:52:37 UTC (rev 5794)
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, 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 Lesser General
-Public License instead of this License.

Deleted: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml	2009-10-29 06:37:00 UTC (rev 5793)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml	2009-10-29 06:52:37 UTC (rev 5794)
@@ -1,130 +0,0 @@
-<project>
-    <!--General project informations-->
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.kysoh</groupId>
-    <artifactId>plugin-weather</artifactId>
-    <packaging>jar</packaging>
-    <version>3.0</version>
-    <name>Weather forecast plugin for Tux Droid</name>
-    <url>http://www.tuxisalive.com</url>
-    
-    <!--Dependency list-->
-    <dependencies>
-	<dependency>
-	    <groupId>com.kysoh</groupId>
-	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
-	    <version>0.0.3</version>
-	</dependency>
-	<dependency>
-	    <groupId>net.karmaLab</groupId>
-	    <artifactId>karmalab-commons</artifactId>
-	    <version>1.2</version>
-	</dependency>
-    </dependencies>
-    
-    <!--Repository list-->
-    <repositories>
-	<repository>
-	    <id>kysoh</id>
-	    <name>Kysoh Repository</name>
-	    <layout>default</layout>
-	    <url>http://ftp.kysoh.com/maven2</url>
-	    <snapshots>
-		<enabled>false</enabled>
-	    </snapshots>
-	</repository>
-	<repository>
-	    <id>karma-lab</id>
-	    <name>KarmaLab Repository Switchboard</name>
-	    <layout>default</layout>
-	    <url>http://artisan.karma-lab.net/software/repository</url>
-	    <snapshots>
-		<enabled>false</enabled>
-	    </snapshots>
-	</repository>
-    </repositories>
-
-    <!--Build process-->
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-	<plugins>
-
-	    <!--This section copy the dependencies into ./libraries-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-dependency-plugin</artifactId>
-		<executions>
-		    <execution>
-			<id>copy-dependencies</id>
-			<phase>package</phase>
-			<goals>
-			    <goal>copy-dependencies</goal>
-			</goals>
-			<configuration>
-			    <outputDirectory>./libraries</outputDirectory>
-			</configuration>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin run small ant scripts to pack and clean plugin-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-antrun-plugin</artifactId>
-		<version>1.3</version>
-		<executions>
-		    
-		    <!--This section create the .scp file during the package lifecycle-->
-		    <execution>
-			<phase>package</phase>
-			<id>package</id>
-			<configuration>
-			    <tasks>
-				<mkdir dir="./libraries"/>
-				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
-				    todir="./libraries" />
-				<zip destfile="./${project.artifactId}.scp">
-                    <zipfileset dir="." includes="resources/*" />
-                    <zipfileset dir="." includes="resources/attitunes/*" />
-                    <zipfileset dir="." includes="libraries/*" >
-                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
-                        <exclude name="libraries/karmalab-commons*" />
-                        <exclude name="libraries/tuxdroid-java-api*" />
-                    </zipfileset>
-                    <zipfileset dir="." includes="executables/*" />
-                </zip>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-
-		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
-		    <execution>
-			<phase>clean</phase>
-			<configuration>
-			    <tasks>
-				<delete dir="./libraries"/>
-				<delete file="./${project.artifactId}.scp"/>
-			    </tasks>
-			</configuration>
-			<goals>
-			    <goal>run</goal>
-			</goals>
-		    </execution>
-		</executions>
-	    </plugin>
-
-	    <!--This plugin compile the project-->
-	    <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<configuration>
-		    <source>1.6</source>
-		    <target>1.6</target>
-		</configuration>
-	    </plugin>
-	</plugins>
-    </build>
-</project>

Copied: software_suite_v3/software/plugin/plugin-weather/trunk/pom.xml (from rev 5793, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/pom.xml)
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/pom.xml	                        (rev 0)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/pom.xml	2009-10-29 06:52:37 UTC (rev 5794)
@@ -0,0 +1,130 @@
+<project>
+    <!--General project informations-->
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.kysoh</groupId>
+    <artifactId>plugin-weather</artifactId>
+    <packaging>jar</packaging>
+    <version>3.0</version>
+    <name>Weather forecast plugin for Tux Droid</name>
+    <url>http://www.tuxisalive.com</url>
+    
+    <!--Dependency list-->
+    <dependencies>
+	<dependency>
+	    <groupId>com.kysoh</groupId>
+	    <artifactId>tuxdroid-plugin-java-kit</artifactId>
+	    <version>0.0.3</version>
+	</dependency>
+	<dependency>
+	    <groupId>net.karmaLab</groupId>
+	    <artifactId>karmalab-commons</artifactId>
+	    <version>1.2</version>
+	</dependency>
+    </dependencies>
+    
+    <!--Repository list-->
+    <repositories>
+	<repository>
+	    <id>kysoh</id>
+	    <name>Kysoh Repository</name>
+	    <layout>default</layout>
+	    <url>http://ftp.kysoh.com/maven2</url>
+	    <snapshots>
+		<enabled>false</enabled>
+	    </snapshots>
+	</repository>
+	<repository>
+	    <id>karma-lab</id>
+	    <name>KarmaLab Repository Switchboard</name>
+	    <layout>default</layout>
+	    <url>http://artisan.karma-lab.net/software/repository</url>
+	    <snapshots>
+		<enabled>false</enabled>
+	    </snapshots>
+	</repository>
+    </repositories>
+
+    <!--Build process-->
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+	<plugins>
+
+	    <!--This section copy the dependencies into ./libraries-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-dependency-plugin</artifactId>
+		<executions>
+		    <execution>
+			<id>copy-dependencies</id>
+			<phase>package</phase>
+			<goals>
+			    <goal>copy-dependencies</goal>
+			</goals>
+			<configuration>
+			    <outputDirectory>./libraries</outputDirectory>
+			</configuration>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin run small ant scripts to pack and clean plugin-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-antrun-plugin</artifactId>
+		<version>1.3</version>
+		<executions>
+		    
+		    <!--This section create the .scp file during the package lifecycle-->
+		    <execution>
+			<phase>package</phase>
+			<id>package</id>
+			<configuration>
+			    <tasks>
+				<mkdir dir="./libraries"/>
+				<copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+				    todir="./libraries" />
+				<zip destfile="./${project.artifactId}.scp">
+                    <zipfileset dir="." includes="resources/*" />
+                    <zipfileset dir="." includes="resources/attitunes/*" />
+                    <zipfileset dir="." includes="libraries/*" >
+                        <exclude name="libraries/tuxdroid-plugin-java-kit*" />
+                        <exclude name="libraries/karmalab-commons*" />
+                        <exclude name="libraries/tuxdroid-java-api*" />
+                    </zipfileset>
+                    <zipfileset dir="." includes="executables/*" />
+                </zip>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+
+		    <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
+		    <execution>
+			<phase>clean</phase>
+			<configuration>
+			    <tasks>
+				<delete dir="./libraries"/>
+				<delete file="./${project.artifactId}.scp"/>
+			    </tasks>
+			</configuration>
+			<goals>
+			    <goal>run</goal>
+			</goals>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--This plugin compile the project-->
+	    <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<configuration>
+		    <source>1.6</source>
+		    <target>1.6</target>
+		</configuration>
+	    </plugin>
+	</plugins>
+    </build>
+</project>

Copied: software_suite_v3/software/plugin/plugin-weather/trunk/resources (from rev 5793, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources)

Copied: software_suite_v3/software/plugin/plugin-weather/trunk/src (from rev 5793, software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/src)

[tuxdroid-svn] r5793 - in software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail: resources src/net/karmaLab/tuxDroid/plugins

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:37:00 +0100 (Thu, 29 Oct 2009)
New Revision: 5793

Modified:
   software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po
   software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po
   software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po
   software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po
   software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot
   software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Merged r5667 through r5785 from random_sentences

Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po	2009-10-29 06:36:27 UTC (rev 5792)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po	2009-10-29 06:37:00 UTC (rev 5793)
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Optionen"
 
-msgid "You have a new message."
-msgstr "Sie haben eine neue Nachricht."
+msgid "You have a new mail."
+msgstr "Sie haben eine neue Email."
 
+msgid "A new mail has arrived !"
+msgstr "Eine neue Mail ist eingetroffen!"
+
+msgid "It appears you have received a new email."
+msgstr "Anscheinend haben Sie eine neue E-Mail erhalten."
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr "Eine neue E-Mail? Ich frage mich, wer gerade an Sie denkt."
+
+msgid "It would appear you have received new mails."
+msgstr "Es sieht so aus, als hätten Sie neue E-Mails erhalten."
+
 msgid "Mail sent by {0}"
 msgstr "Mail gesendet von {0}"
 
-msgid "The message subject is : {0}"
-msgstr "Betreff der Nachricht ist: {0}"
+msgid "The email was sent by {0}"
+msgstr "Die E-Mail wurde gesendet von {0}"
 
+msgid "The sender of the mail is {0}"
+msgstr "Der Absender der E-Mail ist {0}"
+
+msgid "The sender is {0}"
+msgstr "Der Absender ist {0}"
+
+msgid "The email subject is : {0}"
+msgstr "Betreff der Email ist: {0}"
+
+msgid "The subject of the email is : {0}"
+msgstr "Thema der E-Mail ist: {0}"
+
+msgid "The email topic is : {0}"
+msgstr "Das E-Mail-Thema ist: {0}"
+
+msgid "The topic is : {0}"
+msgstr "Das Thema ist: {0}"
+
+msgid "The title of the email is : {0}"
+msgstr "Der Titel der E-Mail ist: {0}"
+
 msgid "No new mail."
 msgstr "Keine neue Mail."
 
+msgid "I'm sorry, nobody sent you any email."
+msgstr "Es tut mir leid, niemand hat Ihnen eine E-Mail gesandt."
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr "Keine Mails. Anscheinend denkt niemand an Sie."
+
+msgid "Your mailbox is empty."
+msgstr "Ihre Mailbox ist leer."
+
 msgid "your_user"
 msgstr "Ihr Benutzer"
 
@@ -78,7 +120,7 @@
 msgstr "Sie müssen das pop3 Dienst in Ihrem Mail-Konto aktivieren"
 
 msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later."
-msgstr "Sorry, Verbindung zum Mailserver nicht möglich. Überprüfen Sie Ihre Internetverbindung oder versuchen Sie es später."
+msgstr "Sorry, Verbindung zum Mailserver nicht möglich. Prüfen Sie die Internet-Verbindung oder versuchen Sie es später."
 
 msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration."
 msgstr "Sorry, Bei der Verbindung mit dem Mailserver gab es einen Fehler. Prüfen Sie Ihre Email-Konfiguration."
@@ -94,3 +136,15 @@
 
 msgid "Start me every x (From full hour)"
 msgstr "Prüfen Sie meine Mailbox häufig"
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr "G-mail ist gerade beschäftigt. Bitte versuchen Sie es später erneut."
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr "Die Google Mail-Website ist gerade ziemlich ausgelastet. Sie sollten es später wieder versuchen."
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr "Ich habe Schwierigkeiten bei der Verbindung mit Google Mail. Bitte versuchen Sie es später erneut."
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr "Ich habe eine Pause beim Prüfen Ihres G-mail-Kontos eingelegt. Die Google-Mail-Website ist gerade zu beschäftigt."

Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po	2009-10-29 06:36:27 UTC (rev 5792)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po	2009-10-29 06:37:00 UTC (rev 5793)
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Options"
 
-msgid "You have a new message."
-msgstr "You have a new message."
+msgid "You have a new mail."
+msgstr "You have a new mail."
 
+msgid "A new mail has arrived !"
+msgstr "A new mail has arrived !"
+
+msgid "It appears you have received a new email."
+msgstr "It appears you have received a new email."
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr "A new email ? I wonder who could be thinking about you."
+
+msgid "It would appear you have received new mails."
+msgstr "It would appear you have received new mails."
+
 msgid "Mail sent by {0}"
 msgstr "Mail sent by {0}"
 
-msgid "The message subject is : {0}"
-msgstr "The message subject is : {0}"
+msgid "The email was sent by {0}"
+msgstr "The email was sent by {0}"
 
+msgid "The sender of the mail is {0}"
+msgstr "The sender of the mail is {0}"
+
+msgid "The sender is {0}"
+msgstr "The sender is {0}"
+
+msgid "The email subject is : {0}"
+msgstr "The email subject is : {0}"
+
+msgid "The subject of the email is : {0}"
+msgstr "The subject of the email is : {0}"
+
+msgid "The email topic is : {0}"
+msgstr "The email topic is : {0}"
+
+msgid "The topic is : {0}"
+msgstr "The topic is : {0}"
+
+msgid "The title of the email is : {0}"
+msgstr "The title of the email is : {0}"
+
 msgid "No new mail."
 msgstr "No new mail."
 
+msgid "I'm sorry, nobody sent you any email."
+msgstr "I'm sorry, nobody sent you any email."
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr "No mails. Nobody seems to be thinking about you."
+
+msgid "Your mailbox is empty."
+msgstr "Your mailbox is empty."
+
 msgid "your_user"
 msgstr "your_user"
 
@@ -94,3 +136,15 @@
 
 msgid "Start me every x (From full hour)"
 msgstr "Check my mail box frequently"
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr "G-mail is busy right now. Please try again later."
+
+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."
+
+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."
+
+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."

Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po	2009-10-29 06:36:27 UTC (rev 5792)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po	2009-10-29 06:37:00 UTC (rev 5793)
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Options"
 
-msgid "You have a new message."
-msgstr "Vous avez un nouveau message"
+msgid "You have a new mail."
+msgstr "Vous avez un nouvel email"
 
+msgid "A new mail has arrived !"
+msgstr "Un nouvel email est arrivé !"
+
+msgid "It appears you have received a new email."
+msgstr "Il semble que vous ayez reçu un email."
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr "Un nouvel email ? Je me demande qui peut bien penser à vous."
+
+msgid "It would appear you have received new mails."
+msgstr "Il semble que des emails soient arrivés"
+
 msgid "Mail sent by {0}"
-msgstr "Message envoyé par {0}"
+msgstr "Email envoyé par {0}"
 
-msgid "The message subject is : {0}"
-msgstr "Le sujet du message est : {0}"
+msgid "The email was sent by {0}"
+msgstr "L'email vous a été envoyé par {0}"
 
+msgid "The sender of the mail is {0}"
+msgstr "L'expéditeur de l'email est {0}"
+
+msgid "The sender is {0}"
+msgstr "L'expéditeur de l'email est : {0}"
+
+msgid "The email subject is : {0}"
+msgstr "L'email a comme sujet : {0}"
+
+msgid "The subject of the email is : {0}"
+msgstr "Le sujet de l'email est : {0}"
+
+msgid "The email topic is : {0}"
+msgstr "Le thème de l'email est : {0}"
+
+msgid "The topic is : {0}"
+msgstr "Le thème est : {0}"
+
+msgid "The title of the email is : {0}"
+msgstr "Le titre de l'email est : {0}"
+
 msgid "No new mail."
-msgstr "Aucun nouveau message"
+msgstr "Aucun nouvel email"
 
+msgid "I'm sorry, nobody sent you any email."
+msgstr "Désolé, personne ne vous a envoyé d'email ..."
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr "Pas de nouveaux emails. Personne ne semble avoir pensé à vous."
+
+msgid "Your mailbox is empty."
+msgstr "Votre boîte email est vide."
+
 msgid "your_user"
 msgstr "votre_identifiant"
 
@@ -81,7 +123,7 @@
 msgstr "Désolé, je ne peux pas me connecter au serveur de messagerie. Merci de controler votre connexion internet ou de réessayer plus tard."
 
 msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration."
-msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du plugin."
+msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du gadget."
 
 msgid "Start every x"
 msgstr "Alertes"
@@ -94,3 +136,15 @@
 
 msgid "Start me every x (From full hour)"
 msgstr "Me faire un rapport régulièrement"
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr "G-mail est occupé pour l'instant. Merci de réessayer plus tard."
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr "Le site d'email de Google a beaucoup de traffic pour le moment. Il est préférable de réessayer plus tard."
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr "J'ai des difficultés à me connecter à Google mail. Merci de réessayer plus tard."
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr "Le temps de réponse est trop long pour vérifier votre compte GMail. Le site Google mail est trop occupé pour l'instant."

Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po	2009-10-29 06:36:27 UTC (rev 5792)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po	2009-10-29 06:37:00 UTC (rev 5793)
@@ -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"
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Opties"
 
-msgid "You have a new message."
-msgstr "Je hebt een nieuw bericht"
+msgid "You have a new mail."
+msgstr "Je hebt een nieuwe email."
 
+msgid "A new mail has arrived !"
+msgstr "Er is een nieuwe mail binnengekomen !"
+
+msgid "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 "Een nieuwe email ? Ik ben benieuwd van wie het is."
+
+msgid "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 message subject is : {0}"
+msgid "The email was sent by {0}"
+msgstr "De email werd verzonden door {0}"
+
+msgid "The sender of the mail is {0}"
+msgstr "De afzender van de mail is {0}"
+
+msgid "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 "Het onderwerp van de email is : {0}"
+
+msgid "The email topic is : {0}"
+msgstr "Het email onderwerp is : {0}"
+
+msgid "The topic is : {0}"
+msgstr "Het onderwerp is : {0}"
+
+msgid "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 "Sorry, niemand heeft je een mail gestuurd."
+
+msgid "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 "Je mailbox is leeg."
+
 msgid "your_user"
 msgstr "jouw_login"
 
@@ -78,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"
@@ -94,3 +136,15 @@
 
 msgid "Start me every x (From full hour)"
 msgstr "Check mijn E-mail op regelmatige tijdstippen"
+
+msgid "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 "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 "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 "Ik krijg een time-out als ik een verbinding maak met je Gimail account. De Goegel mail website, heeft teveel verkeer op het ogenblik."

Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot	2009-10-29 06:36:27 UTC (rev 5792)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/plugin.pot	2009-10-29 06:37:00 UTC (rev 5793)
@@ -1,63 +1,106 @@
-msgid "Mail Gadget"
-msgstr ""
-
-msgid "Username"
-msgstr ""
-
-msgid "Server host"
-msgstr ""
-
-msgid "Server port"
-msgstr ""
-
-msgid "IMAP folder to retreive"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
-msgid "Protocol"
-msgstr ""
-
-msgid "Check if there is any new mail"
-msgstr ""
-
-msgid "Read your mail"
-msgstr ""
-
-msgid "User parameters"
-msgstr ""
-
-msgid "Server parameters"
-msgstr ""
-
-msgid "Advanced Server parameters"
-msgstr ""
-
-msgid "Options"
-msgstr ""
-
-msgid "You have a new message."
-msgstr ""
-
-msgid "Mail sent by {0}"
-msgstr ""
-
-msgid "The message subject is : {0}"
-msgstr ""
-
-msgid "No new mail."
-msgstr ""
-
-msgid "your_user"
-msgstr ""
-
-msgid "your_secret_password"
-msgstr ""
-
-msgid "your.server.com"
+
+msgid "GMail Plugin"
 msgstr ""
 
+msgid "Username"
+msgstr ""
+
+msgid "Server host"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "IMAP folder to retreive"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Protocol"
+msgstr ""
+
+msgid "Check if there is any new mail"
+msgstr ""
+
+msgid "Read your mail"
+msgstr ""
+
+msgid "User parameters"
+msgstr ""
+
+msgid "Server parameters"
+msgstr ""
+
+msgid "Advanced Server parameters"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "You have a new mail."
+msgstr ""
+
+msgid "A new mail has arrived !"
+msgstr ""
+
+msgid "It appears you have received a new email."
+msgstr ""
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr ""
+
+msgid "It would appear you have received new mails."
+msgstr ""
+
+msgid "Mail sent by {0}"
+msgstr ""
+
+msgid "The email was sent by {0}"
+msgstr ""
+
+msgid "The sender of the mail is {0}"
+msgstr ""
+
+msgid "The sender is {0}"
+msgstr ""
+
+msgid "The email subject is : {0}"
+msgstr ""
+
+msgid "The subject of the email is : {0}"
+msgstr ""
+
+msgid "The email topic is : {0}"
+msgstr ""
+
+msgid "The topic is : {0}"
+msgstr ""
+
+msgid "The title of the email is : {0}"
+msgstr ""
+
+msgid "No new mail."
+msgstr ""
+
+msgid "I'm sorry, nobody sent you any email."
+msgstr ""
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr ""
+
+msgid "Your mailbox is empty."
+msgstr ""
+
+msgid "your_user"
+msgstr ""
+
+msgid "your_secret_password"
+msgstr ""
+
+msgid "your.server.com"
+msgstr ""
+
 msgid "Use sender filter"
 msgstr ""
 
@@ -68,14 +111,37 @@
 msgstr ""
 
 msgid "Subject filter to apply"
-msgstr ""
-
-msgid "You must activate the pop3 service in your Mail account"
-msgstr ""
+msgstr ""
 
+msgid "You must activate the pop3 service in your Mail account"
+msgstr ""
 
 msgid "Sorry, I could not connect to the mail server. Please check your internet connection or try again later."
 msgstr ""
 
 msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration."
 msgstr ""
+
+msgid "Start every x"
+msgstr ""
+
+msgid "Start me every x"
+msgstr ""
+
+msgid "Start every x from full hour"
+msgstr ""
+
+msgid "Start me every x (From full hour)"
+msgstr ""
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr ""
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr ""
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr ""
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr ""

Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java	2009-10-29 06:36:27 UTC (rev 5792)
+++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java	2009-10-29 06:37:00 UTC (rev 5793)
@@ -1,354 +1,404 @@
-/* This file is part of "TuxDroid Gadget Mail".
- *    Copyright 2008, kysoh
- *    Author : Yoran Brault
- *    eMail  : software@_bad_karma-lab.net (remove _bad_ before sending an email)
- *    Site   : http://www.kysoh.com/
- *
- * "TuxDroid Gadget Mail" 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 Gadget Mail" 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 Gadget Mail"; 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 net.karmaLab.tuxDroid.plugins;
-
-import java.io.IOException;
-import java.security.Security;
-import java.util.Properties;
-import java.util.Vector;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.Flags.Flag;
-import javax.mail.internet.InternetAddress;
-
-import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
-
-/**
- * @author User
- */
-public class MailPlugin extends SimplePlugin<Configuration>
-{
-	/**
-	 * @param args
-	 * @throws Exception
-	 */
-	public static void main(String[] args) throws Exception
-    {
-		new MailPlugin().boot(args, new Configuration());
-	}
-
-    /**
-	 *
-	 */
-	@Override
-	public void start()
-    {
-        try
-        {
-            if (getCommand().equals("run"))
-            {
-                run();
-            }
-            else if (getCommand().equals("check"))
-            {
-                check();
-            }
-            else
-            {
-                run();
-            }
-        }
-        catch (Exception e) {}
-	}
-
-
-    /**
-	 * @throws MessagingException
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 */
-	public void check() throws MessagingException, IOException, ClassNotFoundException, Exception
-    {
-		Message messages[] = connectToMailBox();
-
-		if (messages == null)
-		{
-			throwResult(false);
-			return;
-		}
-        String sessionId = "pop.gmail.com_" + configuration().getUser();
-		State stateAlert = readState(State.class, sessionId + "ALERT");
-        /* Is first check ? */
-        boolean firstCheck;
-        if (stateAlert.getLastMessages().size() == 0)
-        {
-            firstCheck = true;
-            stateAlert.getLastMessages().add("FIRST_CHECK_HACK");
-        }
-        else
-        {
-            firstCheck = false;
-        }
-        /* Check if you have a new message */
-		boolean newMessageAlert = false;
-		for (int i = messages.length - 1; i >= 0; i--)
-		{
-			if (!messages[i].getFlags().contains(Flag.SEEN))
-			{
-                String subject = messages[i].getSubject();
-                if (subject != null)
-                {
-                    if (!stateAlert.getLastMessages().contains(subject))
-                    {
-                        newMessageAlert = true;
-                        stateAlert.getLastMessages().add(subject);
-                    }
-                }
-			}
-		}
-        if((newMessageAlert) && (!firstCheck))
-        {
-            throwResult(true);
-            throwMessage("You have a new message.");
-        }
-        else
-        {
-            throwResult(false);
-        }
-		/* Save the current referenced mails */
-		writeState(stateAlert, sessionId + "ALERT");
-	}
-
-	/**
-	 *
-	 * @throws MessagingException
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 */
-	public void run() throws MessagingException, IOException, ClassNotFoundException
-    {
-		Message messages[] = connectToMailBox();
-		if (messages == null)
-		{
-			return;
-		}
-        String sessionId = "pop.gmail.com_" + configuration().getUser();
-		State stateRun = readState(State.class, sessionId + "RUN");
-        /* Check for new message */
-		boolean newMessageRun = false;
-        for (int i = messages.length - 1; i >= 0; i--)
-        {
-			if (!messages[i].getFlags().contains(Flag.SEEN))
-			{
-				if (!stateRun.getLastMessages().contains(messages[i].getSubject()))
-				{
-					newMessageRun = true;
-					break;
-				}
-			}
-		}
-		/* If new message found */
-		if (newMessageRun)
-		{
-			int mailCounter = 0;
-            boolean notifyNoNewMail = true;
-			/* For all unread mails */
-			for (int i = messages.length - 1; i >= 0; i--)
-			{
-                String subject;
-                String filteredSubject;
-                String sender;
-                String senderPersonal;
-                String senderAddress;
-                boolean seen;
-                boolean mailAlreadyRead;
-
-                try
-                {
-                    /* Get current mail data */
-                    subject = messages[i].getSubject();
-                    senderPersonal = ((InternetAddress) messages[i].getFrom()[0]).getPersonal();
-                    senderAddress = ((InternetAddress)messages[i].getFrom()[0]).getAddress();
-                    seen = messages[i].getFlags().contains(Flag.SEEN);
-                    /* Pass if mail is already seen */
-                    if (seen)
-                    {
-                        continue;
-                    }
-                    /* Pass if subject is empty */
-                    if (subject == null)
-                    {
-                        continue;
-                    }
-                    /* Filtering the mail address */
-                    if (senderPersonal == null)
-                    {
-                        sender = senderAddress;
-                    }
-                    else
-                    {
-                        sender = senderPersonal;
-                    }
-                    if (sender.contains("<"))
-                    {
-                        sender = sender.substring(0, sender.indexOf("<"));
-                    }
-                    /* Filtering the mail subject */
-                    filteredSubject = subject.replace("*", " ");
-                    filteredSubject = filteredSubject.replace("_", " ");
-                    filteredSubject = filteredSubject.replace("{", " ");
-                    filteredSubject = filteredSubject.replace("}", " ");
-                    filteredSubject = filteredSubject.replace("[", " ");
-                    filteredSubject = filteredSubject.replace("]", " ");
-                    filteredSubject = filteredSubject.replace("/", " ");
-                    filteredSubject = filteredSubject.replace("\\", " ");
-                    filteredSubject = filteredSubject.replace("  ", " ");
-                    mailAlreadyRead = false;
-                    /* Check if the mail has already be read */
-                    for (int j = 0; j < stateRun.getLastMessages().size(); j++)
-                    {
-                        if (filteredSubject.equals(stateRun.getLastMessages().get(j)))
-                        {
-                            mailAlreadyRead = true;
-                            break;
-                        }
-                    }
-                    /* If the mail is not already read */
-                    if (!mailAlreadyRead)
-                    {
-                        notifyNoNewMail = false;
-                        /* Read max 5 mails */
-                        mailCounter++;
-                        if (mailCounter <= 5)
-                        {
-                            throwMessage("Mail sent by {0}", sender);
-                            throwMessage("The message subject is : {0}", filteredSubject);
-                        }
-                        /* Referencing the current mail */
-                        stateRun.getLastMessages().add(filteredSubject);
-                    }
-                }
-                catch (Exception e)
-                {
-                    /* Prevent unhandled errors */
-                    ;
-                }
-			}
-			if(notifyNoNewMail)
-			{
-				throwMessage("No new mail.");
-			}
-		}
-		/* No new message */
-		else
-		{
-			throwMessage("No new mail.");
-		}
-		/* Save the current referenced mails */
-		writeState(stateRun, sessionId + "RUN");
-	}
-
-	/**
-	 *
-	 * @return
-	 * @throws MessagingException
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 */
-    private Message[] connectToMailBox() throws MessagingException, IOException, ClassNotFoundException
-    {
-        String user;
-        String host;
-        String password;
-        Session session;
-        Properties props;
-        int port;
-        String protocol;
-        Store store;
-        Folder folder;
-        Message messages[];
-
-        /* Get user data */
-        user = configuration().getUser();
-        password = configuration().getPassword();
-        host = "pop.gmail.com";
-        /* Set ssl socket */
-		Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.plugins.DummySSLSocketFactory");
-		/* Set text decoder */
-		System.setProperty("mail.mime.decodetext.strict", "false");
-        /* Configure seesion */
-		props = new Properties();
-		session = Session.getDefaultInstance(props, null);
-        /* Find server port */
-		port = 995;
-        /* Get mail protocol */
-        protocol = "pop3s";
-        /* Create mail store */
-        store = session.getStore(protocol);
-        /* Connect to the mailbox */
-        try
-        {
-		    store.connect(host, port, user, password);
-		}
-		/* Authentification exception (login / password / protocol / etc) */
-		catch (javax.mail.AuthenticationFailedException e)
-		{
-            if (!getCommand().equals("check"))
-            {
-                if (e.toString().contains("[SYS/PERM]"))
-                {
-                    BareBonesBrowserLaunch.openURL("http://mail.google.com/mail/?#settings/fwdandpop");
-                    throwMessage("You must activate the pop3 service in your Mail account");
-                }
-                else
-                {
-                    throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration.");
-                }
-            }
-            return null;
-		}
-		/* Connection failed exception (timeout / network unreachable) */
-		catch (javax.mail.MessagingException e)
-		{
-            if (!getCommand().equals("check"))
-            {
-                throwMessage("Sorry, I could not connect to the mail server. Please check your internet connection or try again later.");
-            }
-            return null;
-        }
-        /* Connect and open inbox folder */
-        folder = store.getFolder("INBOX");
-		folder.open(Folder.READ_ONLY);
-        /* Get messages */
-		messages = folder.getMessages();
-        return messages;
-    }
-
-	@Override
-	protected void onPluginEvent(String arg0, String[] arg1) throws Throwable
-	{
-		// TODO Auto-generated method stub
-		;
-	}
-
-	@Override
-	protected void onPluginStop() throws Throwable
-	{
-		// TODO Auto-generated method stub
-		;
-	}
-}
\ No newline at end of file
+/* This file is part of "TuxDroid Gadget Mail".
+ *    Copyright 2008, kysoh
+ *    Author : Yoran Brault
+ *    eMail  : software@_bad_karma-lab.net (remove _bad_ before sending an
+ *    email)
+ *    Site   : http://www.kysoh.com/
+ *
+ * "TuxDroid Gadget Mail" 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 Gadget Mail" 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 Gadget Mail"; 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 net.karmaLab.tuxDroid.plugins;
+
+import java.io.IOException;
+import java.security.Security;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.Random;
+
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Store;
+import javax.mail.Flags.Flag;
+import javax.mail.internet.InternetAddress;
+
+import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
+
+/**
+ * @author User
+ */
+public class MailPlugin extends SimplePlugin<Configuration>
+{
+    String[] newMailSentences = {
+        "You have a new mail.",
+        "A new mail has arrived !",
+        "It appears you have received a new email.",
+        "A new email ? I wonder who could be thinking about you.",
+        "It would appear you have received new mails."
+    };
+
+    String[] mailSenderSentences = {
+        "Mail sent by {0}",
+        "The email was sent by {0}",
+        "The sender of the mail is {0}",
+        "The sender is {0}"
+    };
+
+    String[] mailSubjectSentences = {
+        "The email subject is : {0}",
+        "The subject of the email is : {0}",
+        "The email topic is : {0}",
+        "The topic is : {0}",
+        "The title of the email is : {0}"
+    };
+
+    String[] noNewMailSentences = {
+        "No new mail.",
+        "I'm sorry, nobody sent you any email.",
+        "No mails. Nobody seems to be thinking about you.",
+        "Your mailbox is empty."
+    };
+
+    String[] timeoutSentences = {
+        "G-mail is busy right now. Please try again later.",
+        "The Google mail website has a lot of traffic at the moment. Better to try again later.",
+        "I'm having difficulties to connect to Google mail. Please try again later.",
+        "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+    };
+
+    /**
+     * @param args
+     * @throws Exception
+     */
+    public static void main(String[] args) throws Exception
+    {
+        new MailPlugin().boot(args, new Configuration());
+    }
+
+    /**
+     *
+     */
+    @Override
+        public void start()
+        {
+            try
+            {
+                if (getCommand().equals("run"))
+                {
+                    run();
+                }
+                else if (getCommand().equals("check"))
+                {
+                    check();
+                }
+                else
+                {
+                    run();
+                }
+            }
+            catch (Exception e) {}
+        }
+
+
+    /**
+     * @throws MessagingException
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    public void check() throws MessagingException, IOException, ClassNotFoundException, Exception
+    {
+        Message messages[] = connectToMailBox();
+
+        if (messages == null)
+        {
+            throwResult(false);
+            return;
+        }
+        String sessionId = "pop.gmail.com_" + configuration().getUser();
+        State stateAlert = readState(State.class, sessionId + "ALERT");
+        /* Is first check ? */
+        boolean firstCheck;
+        if (stateAlert.getLastMessages().size() == 0)
+        {
+            firstCheck = true;
+            stateAlert.getLastMessages().add("FIRST_CHECK_HACK");
+        }
+        else
+        {
+            firstCheck = false;
+        }
+        /* Check if you have a new message */
+        boolean newMessageAlert = false;
+        for (int i = messages.length - 1; i >= 0; i--)
+        {
+            if (!messages[i].getFlags().contains(Flag.SEEN))
+            {
+                String subject = messages[i].getSubject();
+                if (subject != null)
+                {
+                    if (!stateAlert.getLastMessages().contains(subject))
+                    {
+                        newMessageAlert = true;
+                        stateAlert.getLastMessages().add(subject);
+                    }
+                }
+            }
+        }
+        if((newMessageAlert) && (!firstCheck))
+        {
+            throwResult(true);
+            throwMessage(this.pickSentence(newMailSentences));
+        }
+        else
+        {
+            throwResult(false);
+        }
+        /* Save the current referenced mails */
+        writeState(stateAlert, sessionId + "ALERT");
+    }
+
+    /**
+     *
+     * @throws MessagingException
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    public void run() throws MessagingException, IOException, ClassNotFoundException
+    {
+        Message messages[] = connectToMailBox();
+        if (messages == null)
+        {
+            return;
+        }
+        String sessionId = "pop.gmail.com_" + configuration().getUser();
+        State stateRun = readState(State.class, sessionId + "RUN");
+
+        String senderSentence = this.pickSentence(mailSenderSentences);
+        String subjectSentence = this.pickSentence(mailSubjectSentences);
+        /* Check for new message */
+        boolean newMessageRun = false;
+        for (int i = messages.length - 1; i >= 0; i--)
+        {
+            if (!messages[i].getFlags().contains(Flag.SEEN))
+            {
+                if (!stateRun.getLastMessages().contains(messages[i].getSubject()))
+                {
+                    newMessageRun = true;
+                    break;
+                }
+            }
+        }
+        /* If new message found */
+        if (newMessageRun)
+        {
+            int mailCounter = 0;
+            boolean notifyNoNewMail = true;
+            /* For all unread mails */
+            for (int i = messages.length - 1; i >= 0; i--)
+            {
+                String subject;
+                String filteredSubject;
+                String sender;
+                String senderPersonal;
+                String senderAddress;
+                boolean seen;
+                boolean mailAlreadyRead;
+
+                try
+                {
+                    /* Get current mail data */
+                    subject = messages[i].getSubject();
+                    senderPersonal = ((InternetAddress) messages[i].getFrom()[0]).getPersonal();
+                    senderAddress = ((InternetAddress)messages[i].getFrom()[0]).getAddress();
+                    seen = messages[i].getFlags().contains(Flag.SEEN);
+                    /* Pass if mail is already seen */
+                    if (seen)
+                    {
+                        continue;
+                    }
+                    /* Pass if subject is empty */
+                    if (subject == null)
+                    {
+                        continue;
+                    }
+                    /* Filtering the mail address */
+                    if (senderPersonal == null)
+                    {
+                        sender = senderAddress;
+                    }
+                    else
+                    {
+                        sender = senderPersonal;
+                    }
+                    if (sender.contains("<"))
+                    {
+                        sender = sender.substring(0, sender.indexOf("<"));
+                    }
+                    /* Filtering the mail subject */
+                    filteredSubject = subject.replace("*", " ");
+                    filteredSubject = filteredSubject.replace("_", " ");
+                    filteredSubject = filteredSubject.replace("{", " ");
+                    filteredSubject = filteredSubject.replace("}", " ");
+                    filteredSubject = filteredSubject.replace("[", " ");
+                    filteredSubject = filteredSubject.replace("]", " ");
+                    filteredSubject = filteredSubject.replace("/", " ");
+                    filteredSubject = filteredSubject.replace("\\", " ");
+                    filteredSubject = filteredSubject.replace("  ", " ");
+                    mailAlreadyRead = false;
+                    /* Check if the mail has already be read */
+                    for (int j = 0; j < stateRun.getLastMessages().size(); j++)
+                    {
+                        if (filteredSubject.equals(stateRun.getLastMessages().get(j)))
+                        {
+                            mailAlreadyRead = true;
+                            break;
+                        }
+                    }
+                    /* If the mail is not already read */
+                    if (!mailAlreadyRead)
+                    {
+                        notifyNoNewMail = false;
+                        /* Read max 5 mails */
+                        mailCounter++;
+                        if (mailCounter <= 5)
+                        {
+                            throwMessage(senderSentence, sender);
+                            throwMessage(subjectSentence, filteredSubject);
+                        }
+                        /* Referencing the current mail */
+                        stateRun.getLastMessages().add(filteredSubject);
+                    }
+                }
+                catch (Exception e)
+                {
+                    /* Prevent unhandled errors */
+                    ;
+                }
+            }
+            if(notifyNoNewMail)
+            {
+                throwMessage(this.pickSentence(noNewMailSentences));
+            }
+        }
+        /* No new message */
+        else
+        {
+            throwMessage(this.pickSentence(noNewMailSentences));
+        }
+        /* Save the current referenced mails */
+        writeState(stateRun, sessionId + "RUN");
+    }
+
+    /**
+     * This function return a sentences from a defined list
+     */
+    private String pickSentence(String[] list) {
+        Random rand = new Random();
+        return list[rand.nextInt(list.length)];
+    }
+
+    /**
+     *
+     * @return
+     * @throws MessagingException
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    private Message[] connectToMailBox() throws MessagingException, IOException, ClassNotFoundException
+    {
+        String user;
+        String host;
+        String password;
+        Session session;
+        Properties props;
+        int port;
+        String protocol;
+        Store store;
+        Folder folder;
+        Message messages[];
+
+        /* Get user data */
+        user = configuration().getUser();
+        password = configuration().getPassword();
+        host = "pop.gmail.com";
+        /* Set ssl socket */
+        Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.plugins.DummySSLSocketFactory");
+        /* Set text decoder */
+        System.setProperty("mail.mime.decodetext.strict", "false");
+        /* Configure seesion */
+        props = new Properties();
+        session = Session.getDefaultInstance(props, null);
+        /* Find server port */
+        port = 995;
+        /* Get mail protocol */
+        protocol = "pop3s";
+        /* Create mail store */
+        store = session.getStore(protocol);
+        /* Connect to the mailbox */
+        try
+        {
+            store.connect(host, port, user, password);
+        }
+        /* Authentification exception (login / password / protocol / etc) */
+        catch (javax.mail.AuthenticationFailedException e)
+        {
+            if (!getCommand().equals("check"))
+            {
+                if (e.toString().contains("[SYS/PERM]"))
+                {
+                    BareBonesBrowserLaunch.openURL("http://mail.google.com/mail/?#settings/fwdandpop");
+                    throwMessage("You must activate the pop3 service in your Mail account");
+                }
+                else
+                {
+                    throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration.");
+                }
+            }
+            return null;
+        }
+        /* Connection failed exception (timeout / network unreachable) */
+        catch (javax.mail.MessagingException e)
+        {
+            if (!getCommand().equals("check"))
+            {
+                throwMessage("Sorry, I could not connect to the mail server. Please check your internet connection or try again later.");
+            }
+            return null;
+        }
+        /* Connect and open inbox folder */
+        folder = store.getFolder("INBOX");
+        folder.open(Folder.READ_ONLY);
+        /* Get messages */
+        messages = folder.getMessages();
+        return messages;
+    }
+
+    @Override
+        protected void onPluginEvent(String arg0, String[] arg1) throws Throwable
+        {
+            // TODO Auto-generated method stub
+            ;
+        }
+
+    @Override
+        protected void onPluginStop() throws Throwable
+        {
+            // TODO Auto-generated method stub
+            ;
+        }
+}

[tuxdroid-svn] r5792 - in software_suite_v3/software/plugin/plugin-email/trunk/plugin-email: resources src/net/karmaLab/tuxDroid/plugins

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:36:27 +0100 (Thu, 29 Oct 2009)
New Revision: 5792

Modified:
   software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po
   software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po
   software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po
   software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po
   software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot
   software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Merged r5659 through r5785 from random_sentences

Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po	2009-10-29 06:35:12 UTC (rev 5791)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po	2009-10-29 06:36:27 UTC (rev 5792)
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Optionen"
 
-msgid "You have a new message."
+msgid "You have a new mail."
 msgstr "Sie haben eine neue Email."
 
+msgid "A new mail has arrived !"
+msgstr "Eine neue Mail ist eingetroffen!"
+
+msgid "It appears you have received a new email."
+msgstr "Anscheinend haben Sie eine neue E-Mail erhalten."
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr "Eine neue E-Mail? Ich frage mich, wer gerade an Sie denkt."
+
+msgid "It would appear you have received new mails."
+msgstr "Es sieht so aus, als hätten Sie neue E-Mails erhalten."
+
 msgid "Mail sent by {0}"
 msgstr "Mail gesendet von {0}"
 
-msgid "The message subject is : {0}"
+msgid "The email was sent by {0}"
+msgstr "Die E-Mail wurde gesendet von {0}"
+
+msgid "The sender of the mail is {0}"
+msgstr "Der Absender der E-Mail ist {0}"
+
+msgid "The sender is {0}"
+msgstr "Der Absender ist {0}"
+
+msgid "The email subject is : {0}"
 msgstr "Betreff der Email ist: {0}"
 
+msgid "The subject of the email is : {0}"
+msgstr "Thema der E-Mail ist: {0}"
+
+msgid "The email topic is : {0}"
+msgstr "Das E-Mail-Thema ist: {0}"
+
+msgid "The topic is : {0}"
+msgstr "Das Thema ist: {0}"
+
+msgid "The title of the email is : {0}"
+msgstr "Der Titel der E-Mail ist: {0}"
+
 msgid "No new mail."
 msgstr "Keine neue Mail."
 
+msgid "I'm sorry, nobody sent you any email."
+msgstr "Es tut mir leid, niemand hat Ihnen eine E-Mail gesandt."
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr "Keine Mails. Anscheinend denkt niemand an Sie."
+
+msgid "Your mailbox is empty."
+msgstr "Ihre Mailbox ist leer."
+
 msgid "your_user"
 msgstr "Ihr Benutzer"
 
@@ -91,4 +133,3 @@
 
 msgid "Start me every x (From full hour)"
 msgstr "Prüfen Sie meine Mailbox häufig"
-

Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po	2009-10-29 06:35:12 UTC (rev 5791)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po	2009-10-29 06:36:27 UTC (rev 5792)
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Options"
 
-msgid "You have a new message."
-msgstr "You have a new message."
+msgid "You have a new mail."
+msgstr "You have a new mail."
 
+msgid "A new mail has arrived !"
+msgstr "A new mail has arrived !"
+
+msgid "It appears you have received a new email."
+msgstr "It appears you have received a new email."
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr "A new email ? I wonder who could be thinking about you."
+
+msgid "It would appear you have received new mails."
+msgstr "It would appear you have received new mails."
+
 msgid "Mail sent by {0}"
 msgstr "Mail sent by {0}"
 
-msgid "The message subject is : {0}"
-msgstr "The message subject is : {0}"
+msgid "The email was sent by {0}"
+msgstr "The email was sent by {0}"
 
+msgid "The sender of the mail is {0}"
+msgstr "The sender of the mail is {0}"
+
+msgid "The sender is {0}"
+msgstr "The sender is {0}"
+
+msgid "The email subject is : {0}"
+msgstr "The email subject is : {0}"
+
+msgid "The subject of the email is : {0}"
+msgstr "The subject of the email is : {0}"
+
+msgid "The email topic is : {0}"
+msgstr "The email topic is : {0}"
+
+msgid "The topic is : {0}"
+msgstr "The topic is : {0}"
+
+msgid "The title of the email is : {0}"
+msgstr "The title of the email is : {0}"
+
 msgid "No new mail."
 msgstr "No new mail."
 
+msgid "I'm sorry, nobody sent you any email."
+msgstr "I'm sorry, nobody sent you any email."
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr "No mails. Nobody seems to be thinking about you."
+
+msgid "Your mailbox is empty."
+msgstr "Your mailbox is empty."
+
 msgid "your_user"
 msgstr "your_user"
 

Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po	2009-10-29 06:35:12 UTC (rev 5791)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po	2009-10-29 06:36:27 UTC (rev 5792)
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Options"
 
-msgid "You have a new message."
-msgstr "Vous avez un nouveau message"
+msgid "You have a new mail."
+msgstr "Vous avez un nouvel email"
 
+msgid "A new mail has arrived !"
+msgstr "Un nouvel email est arrivé !"
+
+msgid "It appears you have received a new email."
+msgstr "Il semble que vous ayez reçu un email."
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr "Un nouvel email ? Je me demande qui peut bien penser à vous."
+
+msgid "It would appear you have received new mails."
+msgstr "Il semble que des emails soient arrivés"
+
 msgid "Mail sent by {0}"
-msgstr "Message envoyé par {0}"
+msgstr "Email envoyé par {0}"
 
-msgid "The message subject is : {0}"
-msgstr "Le sujet du message est : {0}"
+msgid "The email was sent by {0}"
+msgstr "L'email vous a été envoyé par {0}"
 
+msgid "The sender of the mail is {0}"
+msgstr "L'expéditeur de l'email est {0}"
+
+msgid "The sender is {0}"
+msgstr "L'expéditeur de l'email est : {0}"
+
+msgid "The email subject is : {0}"
+msgstr "L'email a comme sujet : {0}"
+
+msgid "The subject of the email is : {0}"
+msgstr "Le sujet de l'email est : {0}"
+
+msgid "The email topic is : {0}"
+msgstr "Le thème de l'email est : {0}"
+
+msgid "The topic is : {0}"
+msgstr "Le thème est : {0}"
+
+msgid "The title of the email is : {0}"
+msgstr "Le titre de l'email est : {0}"
+
 msgid "No new mail."
-msgstr "Aucun nouveau message"
+msgstr "Aucun nouvel email"
 
+msgid "I'm sorry, nobody sent you any email."
+msgstr "Désolé, personne ne vous a envoyé d'email ..."
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr "Pas de nouveaux emails. Personne ne semble avoir pensé à vous."
+
+msgid "Your mailbox is empty."
+msgstr "Votre boîte email est vide."
+
 msgid "your_user"
 msgstr "votre_identifiant"
 

Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po	2009-10-29 06:35:12 UTC (rev 5791)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po	2009-10-29 06:36:27 UTC (rev 5792)
@@ -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"
@@ -41,18 +41,60 @@
 msgid "Options"
 msgstr "Opties"
 
-msgid "You have a new message."
-msgstr "Je hebt een nieuw bericht."
+msgid "You have a new mail."
+msgstr "Je hebt een nieuwe email."
 
+msgid "A new mail has arrived !"
+msgstr "Er is een nieuwe mail binnengekomen !"
+
+msgid "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 "Een nieuwe email ? Ik ben benieuwd van wie het is."
+
+msgid "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 message subject is : {0}"
+msgid "The email was sent by {0}"
+msgstr "De email komt van {0}"
+
+msgid "The sender of the mail is {0}"
+msgstr "De afzender van de mail is {0}"
+
+msgid "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 "Het onderwerp van de email is : {0}"
+
+msgid "The email topic is : {0}"
+msgstr "Het email onderwerp is : {0}"
+
+msgid "The topic is : {0}"
+msgstr "Het onderwerp is : {0}"
+
+msgid "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 "Sorry, niemand heeft je een mail gestuurd."
+
+msgid "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 "Je mailbox is leeg."
+
 msgid "your_user"
 msgstr "jouw_login"
 

Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot	2009-10-29 06:35:12 UTC (rev 5791)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/plugin.pot	2009-10-29 06:36:27 UTC (rev 5792)
@@ -1,4 +1,5 @@
-msgid "Mail Gadget"
+
+msgid "Mail Plugin"
 msgstr ""
 
 msgid "Username"
@@ -37,18 +38,60 @@
 msgid "Options"
 msgstr ""
 
-msgid "You have a new message."
+msgid "You have a new mail."
 msgstr ""
 
+msgid "A new mail has arrived !"
+msgstr ""
+
+msgid "It appears you have received a new email."
+msgstr ""
+
+msgid "A new email ? I wonder who could be thinking about you."
+msgstr ""
+
+msgid "It would appear you have received new mails."
+msgstr ""
+
 msgid "Mail sent by {0}"
 msgstr ""
 
-msgid "The message subject is : {0}"
+msgid "The email was sent by {0}"
 msgstr ""
 
+msgid "The sender of the mail is {0}"
+msgstr ""
+
+msgid "The sender is {0}"
+msgstr ""
+
+msgid "The email subject is : {0}"
+msgstr ""
+
+msgid "The subject of the email is : {0}"
+msgstr ""
+
+msgid "The email topic is : {0}"
+msgstr ""
+
+msgid "The topic is : {0}"
+msgstr ""
+
+msgid "The title of the email is : {0}"
+msgstr ""
+
 msgid "No new mail."
 msgstr ""
 
+msgid "I'm sorry, nobody sent you any email."
+msgstr ""
+
+msgid "No mails. Nobody seems to be thinking about you."
+msgstr ""
+
+msgid "Your mailbox is empty."
+msgstr ""
+
 msgid "your_user"
 msgstr ""
 
@@ -75,3 +118,15 @@
 
 msgid "Sorry, there was an error when connecting to the mail server. Please check your email configuration."
 msgstr ""
+
+msgid "Start every x"
+msgstr ""
+
+msgid "Start me every x"
+msgstr ""
+
+msgid "Start every x from full hour"
+msgstr ""
+
+msgid "Start me every x (From full hour)"
+msgstr ""

Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java	2009-10-29 06:35:12 UTC (rev 5791)
+++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java	2009-10-29 06:36:27 UTC (rev 5792)
@@ -1,448 +1,492 @@
-/* This file is part of "TuxDroid Gadget Mail".
- *    Copyright 2008, kysoh
- *    Author : Yoran Brault
- *    eMail  : software@_bad_karma-lab.net (remove _bad_ before sending an email)
- *    Site   : http://www.kysoh.com/
- *
- * "TuxDroid Gadget Mail" 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 Gadget Mail" 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 Gadget Mail"; 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 net.karmaLab.tuxDroid.plugins;
-
-import java.io.IOException;
-import java.security.Security;
-import java.util.Properties;
-import java.util.Vector;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.Flags.Flag;
-import javax.mail.internet.InternetAddress;
-
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.net.InetSocketAddress;
-
-import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
-
-/**
- * @author User
- */
-public class MailPlugin extends SimplePlugin<Configuration>
-{
-	/**
-	 * @param args
-	 * @throws Exception
-	 */
-	public static void main(String[] args) throws Exception
-    {
-		new MailPlugin().boot(args, new Configuration());
-	}
-
-    /**
-	 *
-	 */
-	@Override
-	public void start() throws Exception
-    {
-		if (getCommand().equals("run"))
-        {
-			run();
-		}
-		else if (getCommand().equals("check"))
-        {
-			check();
-		}
-        else
-        {
-            run();
-        }
-	}
-
-
-    /**
-	 * @throws MessagingException
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 */
-	public void check() throws MessagingException, IOException, ClassNotFoundException, Exception
-    {
-		Message messages[] = connectToMailBox();
-
-		if (messages == null)
-		{
-			throwResult(false);
-			return;
-		}
-        String sessionId = configuration().getHost() + "_" + configuration().getUser();
-		State stateAlert = readState(State.class, sessionId + "ALERT");
-        /* Is first check ? */
-        boolean firstCheck;
-        if (stateAlert.getLastMessages().size() == 0)
-        {
-            firstCheck = true;
-            stateAlert.getLastMessages().add("FIRST_CHECK_HACK");
-        }
-        else
-        {
-            firstCheck = false;
-        }
-        /* Check if you have a new message */
-		boolean newMessageAlert = false;
-		for (int i = messages.length - 1; i >= 0; i--)
-		{
-			if (!messages[i].getFlags().contains(Flag.SEEN))
-			{
-                String subject = messages[i].getSubject();
-                if (subject != null)
-                {
-                    if (!stateAlert.getLastMessages().contains(subject))
-                    {
-                        newMessageAlert = true;
-                        stateAlert.getLastMessages().add(subject);
-                    }
-                }
-			}
-		}
-        if((newMessageAlert) && (!firstCheck))
-        {
-            throwResult(true);
-            throwMessage("You have a new message.");
-        }
-        else
-        {
-            throwResult(false);
-        }
-		/* Save the current referenced mails */
-		writeState(stateAlert, sessionId + "ALERT");
-	}
-
-	/**
-	 *
-	 * @throws MessagingException
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 */
-	public void run() throws MessagingException, IOException, ClassNotFoundException
-    {
-		Message messages[] = connectToMailBox();
-		if (messages == null)
-		{
-			return;
-		}
-        String sessionId = configuration().getHost() + "_" + configuration().getUser();
-		State stateRun = readState(State.class, sessionId + "RUN");
-        /* Check for new message */
-		boolean newMessageRun = false;
-        for (int i = messages.length - 1; i >= 0; i--)
-        {
-			if (!messages[i].getFlags().contains(Flag.SEEN))
-			{
-				if (!stateRun.getLastMessages().contains(messages[i].getSubject()))
-				{
-					newMessageRun = true;
-					break;
-				}
-			}
-		}
-		/* If new message found */
-		if (newMessageRun)
-		{
-			int mailCounter = 0;
-            boolean notifyNoNewMail = true;
-			/* For all unread mails */
-			for (int i = messages.length - 1; i >= 0; i--)
-			{
-                String subject;
-                String filteredSubject;
-                String sender;
-                String senderPersonal;
-                String senderAddress;
-                boolean seen;
-                boolean mailAlreadyRead;
-
-                try
-                {
-                    /* Get current mail data */
-                    subject = messages[i].getSubject();
-                    senderPersonal = ((InternetAddress) messages[i].getFrom()[0]).getPersonal();
-                    senderAddress = ((InternetAddress)messages[i].getFrom()[0]).getAddress();
-                    seen = messages[i].getFlags().contains(Flag.SEEN);
-                    /* Pass if mail is already seen */
-                    if (seen)
-                    {
-                        continue;
-                    }
-                    /* Pass if subject is empty */
-                    if (subject == null)
-                    {
-                        continue;
-                    }
-                    /* Filtering the mail address */
-                    if (senderPersonal == null)
-                    {
-                        sender = senderAddress;
-                    }
-                    else
-                    {
-                        sender = senderPersonal;
-                    }
-                    if (sender.contains("<"))
-                    {
-                        sender = sender.substring(0, sender.indexOf("<"));
-                    }
-                    /* Filtering the mail subject */
-                    filteredSubject = subject.replace("*", " ");
-                    filteredSubject = filteredSubject.replace("_", " ");
-                    filteredSubject = filteredSubject.replace("{", " ");
-                    filteredSubject = filteredSubject.replace("}", " ");
-                    filteredSubject = filteredSubject.replace("[", " ");
-                    filteredSubject = filteredSubject.replace("]", " ");
-                    filteredSubject = filteredSubject.replace("/", " ");
-                    filteredSubject = filteredSubject.replace("\\", " ");
-                    filteredSubject = filteredSubject.replace("  ", " ");
-                    mailAlreadyRead = false;
-                    /* Check if the mail has already be read */
-                    for (int j = 0; j < stateRun.getLastMessages().size(); j++)
-                    {
-                        if (filteredSubject.equals(stateRun.getLastMessages().get(j)))
-                        {
-                            mailAlreadyRead = true;
-                            break;
-                        }
-                    }
-                    /* If the mail is not already read */
-                    if (!mailAlreadyRead)
-                    {
-                        notifyNoNewMail = false;
-                        /* Read max 5 mails */
-                        mailCounter++;
-                        if (mailCounter <= 5)
-                        {
-                            throwMessage("Mail sent by {0}", sender);
-                            throwMessage("The message subject is : {0}", filteredSubject);
-                        }
-                        /* Referencing the current mail */
-                        stateRun.getLastMessages().add(filteredSubject);
-                    }
-                }
-                catch (Exception e)
-                {
-                    /* Prevent unhandled errors */
-                    ;
-                }
-			}
-			if(notifyNoNewMail)
-			{
-				throwMessage("No new mail.");
-			}
-		}
-		/* No new message */
-		else
-		{
-			throwMessage("No new mail.");
-		}
-		/* Save the current referenced mails */
-		writeState(stateRun, sessionId + "RUN");
-	}
-
-    /**
-     * Check if the mail server is responding to the x port.
-     * @param host Server host
-     * @param port Server port
-     * @return true or false
-     */
-    private boolean checkMailServer(String host, Integer port)
-    {
-        Socket socket = new Socket();
-        try
-		{
-            socket.connect(new InetSocketAddress(host, port), 1000);
-		}
-		catch (UnknownHostException e)
-		{
-			socket = null;
-			return false;
-		}
-		catch (IOException e)
-		{
-			socket = null;
-			return false;
-		}
-        socket = null;
-        return true;
-    }
-
-    /**
-     * Find the server mail port.
-     * @param host Server host
-     * @return Server port or -1.
-     */
-    private int findMailServerPort(String host)
-    {
-        int port1;
-        int port2;
-        int port3;
-        int port4;
-
-        if ((host.startsWith("pop")) || (host.startsWith("POP")))
-        {
-            port1 = 110;
-            port2 = 995;
-            port3 = 143;
-            port4 = 993;
-        }
-        else
-        {
-            port1 = 143;
-            port2 = 993;
-            port3 = 110;
-            port4 = 995;
-        }
-        if (checkMailServer(host, port1))
-        {
-            return port1;
-        }
-        else if (checkMailServer(host, port2))
-        {
-            return port2;
-        }
-        else if (checkMailServer(host, port3))
-        {
-            return port3;
-        }
-        else if (checkMailServer(host, port4))
-        {
-            return port4;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    /**
-     * Get the mail server protocol from a port.
-     * @param port Mail server port.
-     * @return The mail server protocol.
-     */
-    private String portToProtocol(int port)
-    {
-        switch (port)
-        {
-            case 110:
-                return "pop3";
-            case 995:
-                return "pop3s";
-            case 143:
-                return "imap";
-            case 993:
-                return "imaps";
-            default:
-                return "pop3";
-        }
-    }
-
-	/**
-	 *
-	 * @return
-	 * @throws MessagingException
-	 * @throws IOException
-	 * @throws ClassNotFoundException
-	 */
-    private Message[] connectToMailBox() throws MessagingException, IOException, ClassNotFoundException
-    {
-        String user;
-        String host;
-        String password;
-        Session session;
-        Properties props;
-        int port;
-        String protocol;
-        Store store;
-        Folder folder;
-        Message messages[];
-
-        /* Get user data */
-        user = configuration().getUser();
-        password = configuration().getPassword();
-        host = configuration().getHost();
-        /* Set ssl socket */
-		Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.plugins.DummySSLSocketFactory");
-		/* Set text decoder */
-		System.setProperty("mail.mime.decodetext.strict", "false");
-        /* Configure seesion */
-		props = new Properties();
-		session = Session.getDefaultInstance(props, null);
-        /* Find server port */
-		port = findMailServerPort(host);
-        if (port == -1)
-        {
-            throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration.");
-            return null;
-        }
-        /* Get mail protocol */
-        protocol = portToProtocol(port);
-        /* Create mail store */
-        store = session.getStore(protocol);
-        /* Connect to the mailbox */
-        try
-        {
-		    store.connect(host, port, user, password);
-		}
-		/* Authentification exception (login / password / protocol / etc) */
-		catch (javax.mail.AuthenticationFailedException e)
-		{
-            if (!getCommand().equals("check"))
-            {
-                throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration.");
-            }
-            return null;
-		}
-		/* Connection failed exception (timeout / network unreachable) */
-		catch (javax.mail.MessagingException e)
-		{
-            if (!getCommand().equals("check"))
-            {
-                throwMessage("Sorry, I could not connect to the mail server. Please check your internet connection or try again later.");
-            }
-            return null;
-        }
-        /* Connect and open inbox folder */
-        folder = store.getFolder("INBOX");
-		folder.open(Folder.READ_ONLY);
-        /* Get messages */
-		messages = folder.getMessages();
-        return messages;
-    }
-
-	@Override
-	protected void onPluginEvent(String arg0, String[] arg1) throws Throwable
-	{
-		// TODO Auto-generated method stub
-		;
-	}
-
-	@Override
-	protected void onPluginStop() throws Throwable
-	{
-		// TODO Auto-generated method stub
-		;
-	}
-}
\ No newline at end of file
+/* This file is part of "TuxDroid Gadget Mail".
+ *    Copyright 2008, kysoh
+ *    Author : Yoran Brault
+ *    eMail  : software@_bad_karma-lab.net (remove _bad_ before sending an
+ *    email)
+ *    Site   : http://www.kysoh.com/
+ *
+ * "TuxDroid Gadget Mail" 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 Gadget Mail" 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 Gadget Mail"; 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 net.karmaLab.tuxDroid.plugins;
+
+import java.io.IOException;
+import java.security.Security;
+import java.util.Properties;
+import java.util.Vector;
+import java.util.Random;
+
+import javax.mail.Folder;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Store;
+import javax.mail.Flags.Flag;
+import javax.mail.internet.InternetAddress;
+
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.net.InetSocketAddress;
+
+import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
+
+/**
+ * @author User
+ */
+public class MailPlugin extends SimplePlugin<Configuration>
+{
+
+    String[] newMailSentences = {
+        "You have a new mail.",
+        "A new mail has arrived !",
+        "It appears you have received a new email.",
+        "A new email ? I wonder who could be thinking about you.",
+        "It would appear you have received new mails."
+    };
+
+    String[] mailSenderSentences = {
+        "Mail sent by {0}",
+        "The email was sent by {0}",
+        "The sender of the mail is {0}",
+        "The sender is {0}"
+    };
+
+    String[] mailSubjectSentences = {
+        "The email subject is : {0}",
+        "The subject of the email is : {0}",
+        "The email topic is : {0}",
+        "The topic is : {0}",
+        "The title of the email is : {0}"
+    };
+
+    String[] noNewMailSentences = {
+        "No new mail.",
+        "I'm sorry, nobody sent you any email.",
+        "No mails. Nobody seems to be thinking about you.",
+        "Your mailbox is empty."
+    };
+
+    /**
+     * @param args
+     * @throws Exception
+     */
+    public static void main(String[] args) throws Exception
+    {
+        new MailPlugin().boot(args, new Configuration());
+    }
+
+    /**
+     *
+     */
+    @Override
+    public void start() throws Exception
+    {
+        if (getCommand().equals("run"))
+        {
+            run();
+        }
+        else if (getCommand().equals("check"))
+        {
+            check();
+        }
+        else
+        {
+            run();
+        }
+    }
+
+
+    /**
+     * @throws MessagingException
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    public void check() throws MessagingException, IOException, ClassNotFoundException, Exception
+    {
+        Message messages[] = connectToMailBox();
+
+        if (messages == null)
+        {
+            throwResult(false);
+            return;
+        }
+        String sessionId = configuration().getHost() + "_" + configuration().getUser();
+        State stateAlert = readState(State.class, sessionId + "ALERT");
+        /* Is first check ? */
+        boolean firstCheck;
+        if (stateAlert.getLastMessages().size() == 0)
+        {
+            firstCheck = true;
+            stateAlert.getLastMessages().add("FIRST_CHECK_HACK");
+        }
+        else
+        {
+            firstCheck = false;
+        }
+        /* Check if you have a new message */
+        boolean newMessageAlert = false;
+        for (int i = messages.length - 1; i >= 0; i--)
+        {
+            if (!messages[i].getFlags().contains(Flag.SEEN))
+            {
+                String subject = messages[i].getSubject();
+                if (subject != null)
+                {
+                    if (!stateAlert.getLastMessages().contains(subject))
+                    {
+                        newMessageAlert = true;
+                        stateAlert.getLastMessages().add(subject);
+                    }
+                }
+            }
+        }
+        if((newMessageAlert) && (!firstCheck))
+        {
+            throwResult(true);
+            throwMessage(this.pickSentence(newMailSentences));
+        }
+        else
+        {
+            throwResult(false);
+        }
+        /* Save the current referenced mails */
+        writeState(stateAlert, sessionId + "ALERT");
+    }
+
+    /**
+     *
+     * @throws MessagingException
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    public void run() throws MessagingException, IOException, ClassNotFoundException
+    {
+        Message messages[] = connectToMailBox();
+        if (messages == null)
+        {
+            return;
+        }
+        String sessionId = configuration().getHost() + "_" + configuration().getUser();
+        State stateRun = readState(State.class, sessionId + "RUN");
+        /* Check for new message */
+        boolean newMessageRun = false;
+        for (int i = messages.length - 1; i >= 0; i--)
+        {
+            if (!messages[i].getFlags().contains(Flag.SEEN))
+            {
+                if (!stateRun.getLastMessages().contains(messages[i].getSubject()))
+                {
+                    newMessageRun = true;
+                    break;
+                }
+            }
+        }
+        /* If new message found */
+        if (newMessageRun)
+        {
+            int mailCounter = 0;
+            boolean notifyNoNewMail = true;
+
+            String senderSentence = this.pickSentence(mailSenderSentences);
+            String subjectSentence = this.pickSentence(mailSubjectSentences);
+            /* For all unread mails */
+            for (int i = messages.length - 1; i >= 0; i--)
+            {
+                String subject;
+                String filteredSubject;
+                String sender;
+                String senderPersonal;
+                String senderAddress;
+                boolean seen;
+                boolean mailAlreadyRead;
+
+                try
+                {
+                    /* Get current mail data */
+                    subject = messages[i].getSubject();
+                    senderPersonal = ((InternetAddress) messages[i].getFrom()[0]).getPersonal();
+                    senderAddress = ((InternetAddress)messages[i].getFrom()[0]).getAddress();
+                    seen = messages[i].getFlags().contains(Flag.SEEN);
+                    /* Pass if mail is already seen */
+                    if (seen)
+                    {
+                        continue;
+                    }
+                    /* Pass if subject is empty */
+                    if (subject == null)
+                    {
+                        continue;
+                    }
+                    /* Filtering the mail address */
+                    if (senderPersonal == null)
+                    {
+                        sender = senderAddress;
+                    }
+                    else
+                    {
+                        sender = senderPersonal;
+                    }
+                    if (sender.contains("<"))
+                    {
+                        sender = sender.substring(0, sender.indexOf("<"));
+                    }
+                    /* Filtering the mail subject */
+                    filteredSubject = subject.replace("*", " ");
+                    filteredSubject = filteredSubject.replace("_", " ");
+                    filteredSubject = filteredSubject.replace("{", " ");
+                    filteredSubject = filteredSubject.replace("}", " ");
+                    filteredSubject = filteredSubject.replace("[", " ");
+                    filteredSubject = filteredSubject.replace("]", " ");
+                    filteredSubject = filteredSubject.replace("/", " ");
+                    filteredSubject = filteredSubject.replace("\\", " ");
+                    filteredSubject = filteredSubject.replace("  ", " ");
+                    mailAlreadyRead = false;
+                    /* Check if the mail has already be read */
+                    for (int j = 0; j < stateRun.getLastMessages().size(); j++)
+                    {
+                        if (filteredSubject.equals(stateRun.getLastMessages().get(j)))
+                        {
+                            mailAlreadyRead = true;
+                            break;
+                        }
+                    }
+                    /* If the mail is not already read */
+                    if (!mailAlreadyRead)
+                    {
+                        notifyNoNewMail = false;
+                        /* Read max 5 mails */
+                        mailCounter++;
+                        if (mailCounter <= 5)
+                        {
+                            throwMessage(senderSentence, sender);
+                            throwMessage(subjectSentence, filteredSubject);
+                        }
+                        /* Referencing the current mail */
+                        stateRun.getLastMessages().add(filteredSubject);
+                    }
+                }
+                catch (Exception e)
+                {
+                    /* Prevent unhandled errors */
+                    ;
+                }
+            }
+            if(notifyNoNewMail)
+            {
+                throwMessage(this.pickSentence(noNewMailSentences));
+            }
+        }
+        /* No new message */
+        else
+        {
+            throwMessage(this.pickSentence(noNewMailSentences));
+        }
+        /* Save the current referenced mails */
+        writeState(stateRun, sessionId + "RUN");
+    }
+
+    /**
+      * This function return a sentences from a defined list
+      */
+    private String pickSentence(String[] list) {
+        Random rand = new Random();
+        return list[rand.nextInt(list.length)];
+    }
+    
+    /**
+     * Check if the mail server is responding to the x port.
+     * @param host Server host
+     * @param port Server port
+     * @return true or false
+     */
+    private boolean checkMailServer(String host, Integer port)
+    {
+        Socket socket = new Socket();
+        try
+        {
+            socket.connect(new InetSocketAddress(host, port), 1000);
+        }
+        catch (UnknownHostException e)
+        {
+            socket = null;
+            return false;
+        }
+        catch (IOException e)
+        {
+            socket = null;
+            return false;
+        }
+        socket = null;
+        return true;
+    }
+
+    /**
+     * Find the server mail port.
+     * @param host Server host
+     * @return Server port or -1.
+     */
+    private int findMailServerPort(String host)
+    {
+        int port1;
+        int port2;
+        int port3;
+        int port4;
+
+        if ((host.startsWith("pop")) || (host.startsWith("POP")))
+        {
+            port1 = 110;
+            port2 = 995;
+            port3 = 143;
+            port4 = 993;
+        }
+        else
+        {
+            port1 = 143;
+            port2 = 993;
+            port3 = 110;
+            port4 = 995;
+        }
+        if (checkMailServer(host, port1))
+        {
+            return port1;
+        }
+        else if (checkMailServer(host, port2))
+        {
+            return port2;
+        }
+        else if (checkMailServer(host, port3))
+        {
+            return port3;
+        }
+        else if (checkMailServer(host, port4))
+        {
+            return port4;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     * Get the mail server protocol from a port.
+     * @param port Mail server port.
+     * @return The mail server protocol.
+     */
+    private String portToProtocol(int port)
+    {
+        switch (port)
+        {
+            case 110:
+                return "pop3";
+            case 995:
+                return "pop3s";
+            case 143:
+                return "imap";
+            case 993:
+                return "imaps";
+            default:
+                return "pop3";
+        }
+    }
+
+    /**
+     *
+     * @return
+     * @throws MessagingException
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    private Message[] connectToMailBox() throws MessagingException, IOException, ClassNotFoundException
+    {
+        String user;
+        String host;
+        String password;
+        Session session;
+        Properties props;
+        int port;
+        String protocol;
+        Store store;
+        Folder folder;
+        Message messages[];
+
+        /* Get user data */
+        user = configuration().getUser();
+        password = configuration().getPassword();
+        host = configuration().getHost();
+        /* Set ssl socket */
+        Security.setProperty("ssl.SocketFactory.provider", "net.karmaLab.tuxDroid.plugins.DummySSLSocketFactory");
+        /* Set text decoder */
+        System.setProperty("mail.mime.decodetext.strict", "false");
+        /* Configure seesion */
+        props = new Properties();
+        session = Session.getDefaultInstance(props, null);
+        /* Find server port */
+        port = findMailServerPort(host);
+        if (port == -1)
+        {
+            throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration.");
+            return null;
+        }
+        /* Get mail protocol */
+        protocol = portToProtocol(port);
+        /* Create mail store */
+        store = session.getStore(protocol);
+        /* Connect to the mailbox */
+        try
+        {
+            store.connect(host, port, user, password);
+        }
+        /* Authentification exception (login / password / protocol / etc) */
+        catch (javax.mail.AuthenticationFailedException e)
+        {
+            if (!getCommand().equals("check"))
+            {
+                throwMessage("Sorry, there was an error when connecting to the mail server. Please check your email configuration.");
+            }
+            return null;
+        }
+        /* Connection failed exception (timeout / network unreachable) */
+        catch (javax.mail.MessagingException e)
+        {
+            if (!getCommand().equals("check"))
+            {
+                throwMessage("Sorry, I could not connect to the mail server. Please check your internet connection or try again later.");
+            }
+            return null;
+        }
+        /* Connect and open inbox folder */
+        folder = store.getFolder("INBOX");
+        folder.open(Folder.READ_ONLY);
+        /* Get messages */
+        messages = folder.getMessages();
+        return messages;
+    }
+
+    @Override
+        protected void onPluginEvent(String arg0, String[] arg1) throws Throwable
+        {
+            // TODO Auto-generated method stub
+            ;
+        }
+
+    @Override
+        protected void onPluginStop() throws Throwable
+        {
+            // TODO Auto-generated method stub
+            ;
+        }
+}

[tuxdroid-svn] r5790 - in software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather: resources src/net/karmaLab/tuxDroid/plugins

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-29 07:33:41 +0100 (Thu, 29 Oct 2009)
New Revision: 5790

Modified:
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot
   software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java
Log:
* Merged r5654 through r5789 from random_senteces

Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po	2009-10-28 16:13:13 UTC (rev 5789)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po	2009-10-29 06:33:41 UTC (rev 5790)
@@ -23,15 +23,81 @@
 msgid "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
 msgstr "Das Wetter in {0} ist derzeit \"{1}\" mit einer Temperatur von {2} Grad {3}; die Luftfeuchtigkeit beträgt {4} Prozent."
 
+msgid "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
+msgstr "In {0} ist das Wetter {1} mit einer Temperatur von {2} Grad {3}. Die Luftfeuchtigkeit beträgt {4} Prozent."
+
+msgid "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
+msgstr "Das Wetter ist zurzeit {1} in {0}, die Luftfeuchtigkeit liegt bei {4} Prozent. Die Temperatur beträgt {2} Grad {3}."
+
+msgid "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
+msgstr "Bei einer Temperatur von {2} Grad {3} könnte man das Wetter in {0} als {1} bezeichnen, die Luft ist zu {4} Prozent feucht."
+
+msgid "Current weather is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
+msgstr "Das aktuelle Wetter ist \"{1}\" mit einer Temperatur von {2} Grad {3}; die Luftfeuchtigkeit beträgt {4} Prozent."
+
+msgid "The weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
+msgstr "Das Wetter ist {1}, die Temperatur beträgt {2} Grad {3}. Die Luftfeuchtigkeit beträgt {4} Prozent."
+
+msgid "The weather is currently {1} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
+msgstr "Das Wetter ist zurzeit {1}, die Luftfeuchte liegt bei {4} Prozent. Die Temperatur beträgt {2} Grad {3}."
+
+msgid "With a temperature of {2} degrees {3}, the weather is {1}, and the humidity level is {4} per cent."
+msgstr "Bei einer Temperatur von {2} Grad {3} könnte man das Wetter wohl als {1} bezeichnen, die Luft ist zu {4} Prozent feucht."
+
 msgid "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
 msgstr "Das Wetter in {0} ist derzeit \"unbekannt\" bei einer Temperatur von {1} Grad {2}; die Luftfeuchtigkeit beträgt {3} Prozent."
 
+msgid "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
+msgstr "In {0} ist das Wetter unbekannt, die Temperatur beträgt {1} Grad {2}. Die Luftfeuchtigkeit beträgt {3} Prozent."
+
+msgid "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
+msgstr "Das Wetter in {0} ist zurzeit nicht bekannt, die Luftfeuchtigkeit liegt bei {3} Prozent. Die Temperatur beträgt etwa {1} Grad {2}."
+
+msgid "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
+msgstr "Über die Temperatur von {1} Grad {2} hinaus ist das Wetter in {0} eher unbekannt, die Luftfeuchte beträgt {3} Prozent."
+
+msgid "Current weather is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
+msgstr "Das aktuelle Wetter ist nicht bekannt, die Temperatur beträgt {1} Grad {2}; Die Luftfeuchtigkeit liegt bei {3} Prozent."
+
+msgid "The weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
+msgstr "Das Wetter ist unbekannt, die Temperatur beträgt {1} Grad {2}. Die Luftfeuchtigkeit beträgt {3} Prozent."
+
+msgid "The weather is currently unknown with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
+msgstr "Das Wetter ist zurzeit nicht bekannt, die Luftfeuchtigkeit liegt bei {3} Prozent. Die Temperatur beträgt etwa {1} Grad {2}."
+
+msgid "With a temperature of {1} degrees {2}, the weather is unknown, and the humidity level is {3} per cent."
+msgstr "Über die Temperatur von {1} Grad {2} hinaus ist das Wetter in {0} eher unbekannt, die Luftfeuchte beträgt {3} Prozent."
+
 msgid "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees."
 msgstr "Das Wetter für morgen. \"{0}\" Temperaturen zwischen {1} und {2} Grad."
 
+msgid "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr "Morgen ist das Wetter {0} mit Temperaturen zwischen {1} und {2} Grad."
+
+msgid "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}."
+msgstr "Bei Temperaturen zwischen {1} und {2} Grad ist die Vorschau für morgen {0}."
+
+msgid "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr "Morgen soll das Wetter {0} werden, mit Temperaturen zwischen {1} und {2} Grad."
+
+msgid "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
+msgstr "Morgen wird das Wetter {0} mit Temperaturen zwischen {1} und {2} Grad."
+
 msgid "http://www.google.com/ig/api?hl=en&weather=%s"
 msgstr "http://www.google.com/ig/api?hl=de&weather=%s"
 
+msgid "Location could not be found. Please check the city name or enter another close by location."
+msgstr "Ort nicht gefunden. Prüfen Sie den Namen der Stadt oder geben Sie den einer anderen in Nähe an."
+
+msgid "Impossible to find the specified city name. Are you sure this city really exists ?"
+msgstr "Der Städtename wurde nicht gefunden. Meinen Sie, diese Stadt existiere wirklich?"
+
+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 "Die angegebene Stadt ist nicht in meiner Datenbank. Prüfen Sie, ob es den Städtenamen wirklich gibt oder geben Sie einen anderen aus der Nähe an."
+
+msgid "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
+msgstr "Tut mir leid, ich kann Ihnen das Wetter für den angegebenen Ort nicht nennen. Versuchen Sie einen anderen Städtenamen aus der Nähe."
+
 msgid "Start every x from full hour"
 msgstr "Hinweise"
 
@@ -43,8 +109,3 @@
 
 msgid "Start me daily"
 msgstr "Berichte mir täglich"
-
-msgid "Location could not be found. Please check the city name or enter another close by location."
-msgstr "Ort nicht gefunden. Prüfen Sie den Namen der Stadt oder geben Sie den einer anderen in Nähe an."
-
-

Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po	2009-10-28 16:13:13 UTC (rev 5789)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po	2009-10-29 06:33:41 UTC (rev 5790)
@@ -23,15 +23,81 @@
 msgid "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
 msgstr "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level 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."
+
+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};"
+
+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."
+
+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."
+
+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."
+
+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};"
+
+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."
+
 msgid "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
 msgstr "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} 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."
+
+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};"
+
+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."
+
+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."
+
+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."
+
+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};"
+
+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."
+
 msgid "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees."
-msgstr "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees."
+msgstr "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees;"
 
+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;"
+
+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}."
+
+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;"
+
+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;"
+
 msgid "http://www.google.com/ig/api?hl=en&weather=%s"
 msgstr "http://www.google.com/ig/api?hl=en&weather=%s"
 
+msgid "Location could not be found. Please check the city name or enter another close by location."
+msgstr "Location could not be found. Please check the city name or enter another close by location;"
+
+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 ?"
+
+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."
+
+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."
+
 msgid "Start every x from full hour"
 msgstr "Alerts"
 
@@ -43,7 +109,3 @@
 
 msgid "Start me daily"
 msgstr "Give me a daily report"
-
-msgid "Location could not be found. Please check the city name or enter another close by location."
-msgstr "Location could not be found. Please check the city name or enter another close by location."
-

Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po	2009-10-28 16:13:13 UTC (rev 5789)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po	2009-10-29 06:33:41 UTC (rev 5790)
@@ -23,15 +23,81 @@
 msgid "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
 msgstr "La météo actuelle à {0} est \"{1}\" avec une température de {2} degrés {3}. Le taux d'humidité est de {4} pour cent."
 
+msgid "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
+msgstr "A {0}, la météo est {1} avec une température de {2} degrés {3}. Le taux d'humidité est de {4} pour cent."
+
+msgid "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
+msgstr "La météo est actuellement {1} à {0} avec un taux d'humidité de {4} pour cent. La température est d'environs {2} degrés {3}."
+
+msgid "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
+msgstr "Avec une température de {2} degrés {3}, la météo à {0} est {1}, et le taux d'humidité est de {4} pour cent."
+
+msgid "Current weather is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
+msgstr "La météo actuelle est \"{1}\" avec une température de {2} degrés {3}. Le taux d'humidité est de {4} pour cent."
+
+msgid "The weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
+msgstr "La météo est {1} avec une température de {2} degrés {3}. Le taux d'humidité est de {4} pour cent."
+
+msgid "The weather is currently {1} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
+msgstr "La météo est actuellement {1} avec un taux d'humidité de {4} pour cent. La température est d'environs {2} degrés {3}."
+
+msgid "With a temperature of {2} degrees {3}, the weather is {1}, and the humidity level is {4} per cent."
+msgstr "Avec une température de {2} degrés {3}, la météo est {1}, et le taux d'humidité est de {4} pour cent."
+
 msgid "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
 msgstr "La météo actuelle à {0} est \"inconnue\" avec une température de {1} degrés {2}. Le taux d'humidité est de {3} pour cent."
 
+msgid "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
+msgstr "A {0}, la météo est inconnue avec une température de {1} degrés {2}. Le taux d'humidité est de {3} pour cent."
+
+msgid "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
+msgstr "La météo est actuellement inconnue à {0} avec un taux d'humidité de {3} pour cent. La température est d'environs {1} degrés {2}."
+
+msgid "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
+msgstr "Avec une température de {1} degrés {2}, la météo à {0} est inconnue, et le taux d'humidité est de {3} pour cent."
+
+msgid "Current weather is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
+msgstr "La météo actuelle est \"inconnue\" avec une température de {1} degrés {2}. Le taux d'humidité est de {3} pour cent."
+
+msgid "The weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
+msgstr "La météo est inconnue avec une température de {1} degrés {2}. Le taux d'humidité est de {3} pour cent."
+
+msgid "The weather is currently unknown with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
+msgstr "La météo est actuellement inconnue avec un taux d'humidité de {3} pour cent. La température est d'environs {1} degrés {2}."
+
+msgid "With a temperature of {1} degrees {2}, the weather is unknown, and the humidity level is {3} per cent."
+msgstr "Avec une température de {1} degrés {2}, la météo est inconnue, et le taux d'humidité est de {3} pour cent."
+
 msgid "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees."
 msgstr "Les prévisions pour demain : \"{0}\" avec des température de {1} à {2} degrés."
 
+msgid "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr "Demain, la météo sera {0} avec des températures comprises entre {1} et {2} degrés."
+
+msgid "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}."
+msgstr "Avec des températures comprises entre {1} et {2} degrés, les prévisions pour demain sont {0}."
+
+msgid "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr "La météo demain sera {0} avec des températures comprises entre {1} et {2} degrés."
+
+msgid "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
+msgstr "Demain, la météo sera {0} avec des températures allant de {1} jusqu'à {2} degrés."
+
 msgid "http://www.google.com/ig/api?hl=en&weather=%s"
 msgstr "http://www.google.com/ig/api?hl=fr&weather=%s"
 
+msgid "Location could not be found. Please check the city name or enter another close by location."
+msgstr "La localité ne peut être trouvée. Veuillez vérifier le nom de la ville ou choisir un endroit proche de celle-ci."
+
+msgid "Impossible to find the specified city name. Are you sure this city really exists ?"
+msgstr "Impossible de trouver la ville spécifiée. Etes-vous sur que cette ville existe réellement ?"
+
+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 "La ville que vous avez spécifié ne peut être trouvée dans mes bases de données. Assurez-vous que cette ville existe, ou spécifiez une autre ville proche."
+
+msgid "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
+msgstr "Je suis désolé, mais je ne peux pas vous donner la météo pour cette localité. Veuillez essayer une localité proche de celle-ci."
+
 msgid "Start every x from full hour"
 msgstr "Alertes"
 
@@ -43,7 +109,3 @@
 
 msgid "Start me daily"
 msgstr "Me faire un rapport quotidiennement"
-
-msgid "Location could not be found. Please check the city name or enter another close by location."
-msgstr "La localité ne peut être trouvée. Veuillez vérifier le nom de la ville ou choisir un endroit proche de celle-ci."
-

Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po	2009-10-28 16:13:13 UTC (rev 5789)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po	2009-10-29 06:33:41 UTC (rev 5790)
@@ -23,15 +23,81 @@
 msgid "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
 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}, 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 "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 "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 "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 "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 "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 "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}, 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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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"
 
+msgid "Location could not be found. Please check the city name or enter another close by location."
+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 "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 "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 "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"
 
@@ -43,7 +109,3 @@
 
 msgid "Start me daily"
 msgstr "Start mij dagelijks"
-
-msgid "Location could not be found. Please check the city name or enter another close by location."
-msgstr "Locatie werd niet gevonden. Gelieve de ingegeven stadsnaam te controleren of een andere nabij gelegen stad in te geven."
-

Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot	2009-10-28 16:13:13 UTC (rev 5789)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/plugin.pot	2009-10-29 06:33:41 UTC (rev 5790)
@@ -19,18 +19,81 @@
 msgid "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
 msgstr ""
 
+msgid "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
+msgstr ""
+
+msgid "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
+msgstr ""
+
+msgid "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
+msgstr ""
+
+msgid "Current weather is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent."
+msgstr ""
+
+msgid "The weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent."
+msgstr ""
+
+msgid "The weather is currently {1} with a humidity of {4} per cent. The temperature is around {2} degrees {3}."
+msgstr ""
+
+msgid "With a temperature of {2} degrees {3}, the weather is {1}, and the humidity level is {4} per cent."
+msgstr ""
+
 msgid "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
 msgstr ""
 
+msgid "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
+msgstr ""
+
+msgid "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
+msgstr ""
+
+msgid "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
+msgstr ""
+
+msgid "Current weather is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
+msgstr ""
+
+msgid "The weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent."
+msgstr ""
+
+msgid "The weather is currently unknown with a humidity of {3} per cent. The temperature is around {1} degrees {2}."
+msgstr ""
+
+msgid "With a temperature of {1} degrees {2}, the weather is unknown, and the humidity level is {3} per cent."
+msgstr ""
+
 msgid "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees."
 msgstr ""
 
+msgid "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr ""
+
+msgid "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}."
+msgstr ""
+
+msgid "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees."
+msgstr ""
+
+msgid "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
+msgstr ""
+
 msgid "http://www.google.com/ig/api?hl=en&weather=%s"
 msgstr ""
 
 msgid "Location could not be found. Please check the city name or enter another close by location."
 msgstr ""
 
+msgid "Impossible to find the specified city name. Are you sure this city really exists ?"
+msgstr ""
+
+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 ""
+
+msgid "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
+msgstr ""
+
 msgid "Start every x from full hour"
 msgstr ""
 

Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java	2009-10-28 16:13:13 UTC (rev 5789)
+++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java	2009-10-29 06:33:41 UTC (rev 5790)
@@ -34,6 +34,8 @@
 import java.net.URL;
 import java.net.HttpURLConnection;
 
+import java.util.Random;
+
 import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
 import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration;
 import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginException;
@@ -42,204 +44,246 @@
 import net.karmaLab.xml.parser.XMLParser;
 
 public class WeatherPlugin extends SimplePlugin<WeatherPlugin.Configuration> {
-	public static class Configuration extends SimplePluginConfiguration {
-		private String location = "Paris";
-		private boolean tomorrow = true;
-		private Unit unit = Unit.celsius;
-		private String googleURL;
+    public static class Configuration extends SimplePluginConfiguration {
+        private String location = "Paris";
+        private boolean tomorrow = true;
+        private Unit unit = Unit.celsius;
+        private String googleURL;
 
-		/**
-		 * get googleURL property value.
-		 *
-		 * @return googleURL value
-		 */
-		public String getGoogleURL() {
-			return googleURL;
-		}
+        /**
+         * get googleURL property value.
+         *
+         * @return googleURL value
+         */
+        public String getGoogleURL() {
+            return googleURL;
+        }
 
-		/**
-		 * set googleURL property value.
-		 *
-		 * @param googleURL
-		 *            new value
-		 */
-		public void setGoogleURL(String googleURL) {
-			this.googleURL = googleURL;
-		}
+        /**
+         * set googleURL property value.
+         *
+         * @param googleURL
+         *            new value
+         */
+        public void setGoogleURL(String googleURL) {
+            this.googleURL = googleURL;
+        }
 
-		public String getLocation() {
-			return location;
-		}
+        public String getLocation() {
+            return location;
+        }
 
-		public Unit getUnit() {
-			return unit;
-		}
+        public Unit getUnit() {
+            return unit;
+        }
 
-		public boolean isTomorrow() {
-			return tomorrow;
-		}
+        public boolean isTomorrow() {
+            return tomorrow;
+        }
 
-		public void setLocation(String location) {
-			this.location = location;
-		}
+        public void setLocation(String location) {
+            this.location = location;
+        }
 
-		public void setTomorrow(boolean tomorrow) {
-			this.tomorrow = tomorrow;
+        public void setTomorrow(boolean tomorrow) {
+            this.tomorrow = tomorrow;
 
-		}
+        }
 
-		public void setUnit(Unit unit) {
-			this.unit = unit;
-		}
+        public void setUnit(Unit unit) {
+            this.unit = unit;
+        }
 
-	}
+    }
 
-	public static enum Unit {
-		celsius, fahrenheit
-	}
+    String[] todayWeatherSentences = {
+        "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent.",
+        "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent.",
+        "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}.",
+        "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent.",
+        "Current weather is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent.",
+        "The weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent.",
+        "The weather is currently {1} with a humidity of {4} per cent. The temperature is around {2} degrees {3}.",
+        "With a temperature of {2} degrees {3}, the weather is {1}, and the humidity level is {4} per cent."
+    };
 
-	public static void main(String[] args) throws Exception {
-		new WeatherPlugin().boot(args, new Configuration());
-	}
+    String[] todayUnknownWeatherSentences = {
+        "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent.",
+        "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent.",
+        "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}.",
+        "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent.",
+        "Current weather is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent.",
+        "The weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent.",
+        "The weather is currently unknown with a humidity of {3} per cent. The temperature is around {1} degrees {2}.",
+        "With a temperature of {1} degrees {2}, the weather is unknown, and the humidity level is {3} per cent."
+    };
 
-	private String getData(Element node, String label) {
-		return node.getElement(label).getAttribute("data"); //$NON-NLS-1$
-	}
+    String[] tomorrowWeatherSentences = {
+        "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees.",
+        "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees.",
+        "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}.",
+        "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees.",
+        "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
+    };
 
-	@Override
-	public void start() throws SimplePluginException {
-		File outputFile;
-		File file;
-		String inputLine;
-		Writer streamOutput = null;
-		XMLParser parser = new XMLParser();
-		Element xmlReply;
+    String[] errorSentences = {
+        "Location could not be found. Please check the city name or enter another close by location.",
+        "Impossible to find the specified city name. Are you sure this city really exists ?",
+        "The city you specified could not be found in my database. Make sure the city name exists, or specify another close by city name.",
+        "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
+    };
 
-		try {
-			// Replace the space by %20 (HTML code)
-			configuration().setLocation(configuration().getLocation().replace(" ", "%20"));
-			/* create a new URL object */
-			URL xml = new URL(String.format(configuration().getGoogleURL(), configuration().getLocation()));
-			/* Open the connection */
-            HttpURLConnection.setDefaultRequestProperty("User-Agent", "Mozilla/4.0  ( compatible ) ");
-            HttpURLConnection yc = (HttpURLConnection) xml.openConnection();
-            yc.setRequestProperty ("User-Agent", "Mozilla/4.0  ( compatible ) ");
+    private String pickSentence(String[] list) {
+        Random rand = new Random();
+        return list[rand.nextInt(list.length)];
+    }
 
-			/* And read the stream input */
-			BufferedReader streamInput = new BufferedReader(new InputStreamReader(yc.getInputStream()));
+    public static enum Unit {
+        celsius, fahrenheit
+    }
 
-			/* Create a new file */
-			file = new File("unknowEncoding"); //$NON-NLS-1$
-			/* Connect the writer with the file */
-			streamOutput = new BufferedWriter(new FileWriter(file));
-			/* ... and write the file content */
-			while ((inputLine = streamInput.readLine()) != null) {
-				streamOutput.write(inputLine);
-			}
-			/* Close the streams */
-			streamInput.close();
-			streamOutput.close();
+    public static void main(String[] args) throws Exception {
+        new WeatherPlugin().boot(args, new Configuration());
+    }
 
-			int c;
-			/* Create a new file to convert the first file */
-			outputFile = new File("recoding");
-			/*
-			 * Create a stream reader and a stream writer, and connect them with
-			 * the two files
-			 */
-			InputStreamReader inputStream = new InputStreamReader(new FileInputStream(file));
-			/* Specify the codage for the output file */
-			OutputStreamWriter outputStream = new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"); //$NON-NLS-1$
-			/* Then, write the file char by char */
-			while ((c = inputStream.read()) != -1)
-				outputStream.write(c);
-			/* And close the streams */
-			outputStream.close();
-			inputStream.close();
+    private String getData(Element node, String label) {
+        return node.getElement(label).getAttribute("data"); //$NON-NLS-1$
+    }
 
-			/* Parse the XML file, with an UTF-8 codage */
-			xmlReply = parser.parse(outputFile).getRootElement().getElementAt(0);
+    @Override
+        public void start() throws SimplePluginException {
+            File outputFile;
+            File file;
+            String inputLine;
+            Writer streamOutput = null;
+            XMLParser parser = new XMLParser();
+            Element xmlReply;
 
-		} catch (Exception e) {
-			throw new SimplePluginException(e);
-		}
+            try {
+                // Replace the space by %20 (HTML code)
+                configuration().setLocation(configuration().getLocation().replace(" ", "%20"));
+                /* create a new URL object */
+                URL xml = new URL(String.format(configuration().getGoogleURL(), configuration().getLocation()));
+                /* Open the connection */
+                HttpURLConnection.setDefaultRequestProperty("User-Agent", "Mozilla/4.0  ( compatible ) ");
+                HttpURLConnection yc = (HttpURLConnection) xml.openConnection();
+                yc.setRequestProperty ("User-Agent", "Mozilla/4.0  ( compatible ) ");
 
-		try {
-			Element current = xmlReply.getElementAt(1);
-			String weather = getData(current, "condition");
-			String temperature = getData(current, configuration().getUnit() == Unit.celsius ? "temp_c" : "temp_f");
-			String humidity = getData(current, "humidity"); //$NON-NLS-1$
-			humidity = humidity.split(":")[1]; //$NON-NLS-1$
-			humidity = ((String) humidity.subSequence(0, humidity.length() - 1)).trim();
-            humidity = humidity.replaceAll("[^a-zA-Z0-9]", "");
-			if (weather.length() == 0) {
-				throwMessage("Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent.", configuration().getLocation().replace("%20", " "), temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
-						humidity);
-			} else {
-				throwMessage("Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent.", configuration().getLocation().replace("%20", " "), weather, temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
-						humidity);
-			}
+                /* And read the stream input */
+                BufferedReader streamInput = new BufferedReader(new InputStreamReader(yc.getInputStream()));
 
-			if (configuration().isTomorrow()) {
-				String temperatureHigh;
-				current = xmlReply.getElementAt(3);
-				weather = getData(current, "condition");
+                /* Create a new file */
+                file = new File("unknowEncoding"); //$NON-NLS-1$
+                /* Connect the writer with the file */
+                streamOutput = new BufferedWriter(new FileWriter(file));
+                /* ... and write the file content */
+                while ((inputLine = streamInput.readLine()) != null) {
+                    streamOutput.write(inputLine);
+                }
+                /* Close the streams */
+                streamInput.close();
+                streamOutput.close();
 
-				/*
-				 * There is an annoying difference between google FR and EN. EN :
-				 * Temperatures on the forecast are in Fahrenheit FR : Temperatures
-				 * on the forecast are in Celsius Depending of the control center
-				 * language, the temperature must be converted to respect the CC
-				 * configuration.
-				 */
-				if (configuration().getLanguage().equals("en") && configuration().getUnit() == Unit.celsius) {
-					temperature = fahrenheitToCelsius(getData(current, "low"));
-					temperatureHigh = fahrenheitToCelsius(getData(current, "high"));
-				} else if (!(configuration().getLanguage().equals("en")) && configuration().getUnit() == Unit.fahrenheit) {
-					temperature = celsiusToFahrenheit(getData(current, "low"));
-					temperatureHigh = celsiusToFahrenheit(getData(current, "high"));
-				} else {
-					temperature = getData(current, "low");
-					temperatureHigh = getData(current, "high");
-				}
+                int c;
+                /* Create a new file to convert the first file */
+                outputFile = new File("recoding");
+                /*
+                 * Create a stream reader and a stream writer, and connect them with
+                 * the two files
+                 */
+                InputStreamReader inputStream = new InputStreamReader(new FileInputStream(file));
+                /* Specify the codage for the output file */
+                OutputStreamWriter outputStream = new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"); //$NON-NLS-1$
+                /* Then, write the file char by char */
+                while ((c = inputStream.read()) != -1)
+                    outputStream.write(c);
+                /* And close the streams */
+                outputStream.close();
+                inputStream.close();
 
-				throwMessage("Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees.", weather, temperature, temperatureHigh);
-			}
-			outputFile.deleteOnExit();
-			file.deleteOnExit();
-		} catch (Exception e) {
-			// When a location is unknown, the Google API send back a XML content without data.
-			throwMessage("Location could not be found. Please check the city name or enter another close by location.");
-		}
-	}
+                /* Parse the XML file, with an UTF-8 codage */
+                xmlReply = parser.parse(outputFile).getRootElement().getElementAt(0);
 
-	private String celsiusToFahrenheit(String temp) {
-		float celsiusValue = Float.valueOf(temp).floatValue();
-		float farhenheitValue = (float) ((celsiusValue * 1.8) + 32);
-		return String.valueOf((int) farhenheitValue);
-	}
+            } catch (Exception e) {
+                throw new SimplePluginException(e);
+            }
 
-	private String fahrenheitToCelsius(String temp) {
-		float farhenheitValue = Float.valueOf(temp).floatValue();
-		float celsiusValue = (float) ((farhenheitValue - 32) / 1.8);
-		return String.valueOf((int) celsiusValue);
-	}
+            try {
+                Element current = xmlReply.getElementAt(1);
+                String weather = getData(current, "condition");
+                String temperature = getData(current, configuration().getUnit() == Unit.celsius ? "temp_c" : "temp_f");
+                String humidity = getData(current, "humidity"); //$NON-NLS-1$
+                humidity = humidity.split(":")[1]; //$NON-NLS-1$
+                humidity = ((String) humidity.subSequence(0, humidity.length() - 1)).trim();
+                humidity = humidity.replaceAll("[^a-zA-Z0-9]", "");
+                if (weather.length() == 0) {
+                    throwMessage(this.pickSentence(todayUnknownWeatherSentences), configuration().getLocation().replace("%20", " "),
+                            temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit", humidity);
+                } else {
+                    throwMessage(this.pickSentence(todayWeatherSentences), configuration().getLocation().replace("%20", " "),
+                            weather, temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit", humidity);
+                }
 
-    
-    public void onGadgetStop() 
+                if (configuration().isTomorrow()) {
+                    String temperatureHigh;
+                    current = xmlReply.getElementAt(3);
+                    weather = getData(current, "condition");
+
+                    /*
+                     * There is an annoying difference between google FR and EN. EN :
+                     * Temperatures on the forecast are in Fahrenheit FR : Temperatures
+                     * on the forecast are in Celsius Depending of the control center
+                     * language, the temperature must be converted to respect the CC
+                     * configuration.
+                     */
+                    if (configuration().getLanguage().equals("en") && configuration().getUnit() == Unit.celsius) {
+                        temperature = fahrenheitToCelsius(getData(current, "low"));
+                        temperatureHigh = fahrenheitToCelsius(getData(current, "high"));
+                    } else if (!(configuration().getLanguage().equals("en")) && configuration().getUnit() == Unit.fahrenheit) {
+                        temperature = celsiusToFahrenheit(getData(current, "low"));
+                        temperatureHigh = celsiusToFahrenheit(getData(current, "high"));
+                    } else {
+                        temperature = getData(current, "low");
+                        temperatureHigh = getData(current, "high");
+                    }
+
+                    throwMessage(this.pickSentence(tomorrowWeatherSentences), weather, temperature, temperatureHigh);
+                }
+                outputFile.deleteOnExit();
+                file.deleteOnExit();
+            } catch (Exception e) {
+                // When a location is unknown, the Google API send back a XML content without data.
+                throwMessage(this.pickSentence(errorSentences));
+            }
+        }
+
+    private String celsiusToFahrenheit(String temp) {
+        float celsiusValue = Float.valueOf(temp).floatValue();
+        float farhenheitValue = (float) ((celsiusValue * 1.8) + 32);
+        return String.valueOf((int) farhenheitValue);
+    }
+
+    private String fahrenheitToCelsius(String temp) {
+        float farhenheitValue = Float.valueOf(temp).floatValue();
+        float celsiusValue = (float) ((farhenheitValue - 32) / 1.8);
+        return String.valueOf((int) celsiusValue);
+    }
+
+
+    public void onGadgetStop()
     {
-    	;
+        ;
     }
 
-	@Override
-	protected void onPluginEvent(String arg0, String[] arg1) throws Throwable {
-		// TODO Auto-generated method stub
-		;
-	}
+    @Override
+        protected void onPluginEvent(String arg0, String[] arg1) throws Throwable {
+            // TODO Auto-generated method stub
+            ;
+        }
 
-	@Override
-	protected void onPluginStop() throws Throwable {
-		// TODO Auto-generated method stub
-		;
-	}
+    @Override
+        protected void onPluginStop() throws Throwable {
+            // TODO Auto-generated method stub
+            ;
+        }
 }

[tuxdroid-svn] r5789 - in software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter: resources src

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 17:13:13 +0100 (Wed, 28 Oct 2009)
New Revision: 5789

Modified:
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.po
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.wiki
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/FriendStatut.java
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Message.java
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Reply.java
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/TwitterDatasStruct.java
   software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/TwitterPlugin.java
Log:
* Merged r5720 through r5788 from random_sentences


Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.po	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.po	2009-10-28 16:13:13 UTC (rev 5789)
@@ -16,7 +16,7 @@
 msgid "Tweet following status text"
 msgstr "Tweeten Sie entsprechend dem Statustext"
 
-msgid "Hello all from my Tux Droid twitter gadget"
+msgid "Hello all from my Tux Droid Twitter gadget"
 msgstr "Hallo an alle von meinem Twitter - Tux Droid"
 
 msgid "Check Friends updates"
@@ -40,28 +40,88 @@
 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."
 
-msgid "You have a new friend update"
+msgid "There is a new Tweet available."
 msgstr "Sie haben eine neue Freund Aktualisierung."
 
-msgid "You have {0} friend updates"
+msgid "You have a new Tweet"
+msgstr "Sie haben einen neuen Tweet."
+
+msgid "You have a new Tweet on your Twitter"
+msgstr "Sie haben einen neuen Tweet auf Ihrem Twitter"
+
+msgid "I found a new Tweet on your Twitter account"
+msgstr "Ich habe einen neuen Tweet auf Ihrem Twitter-Konto gefunden"
+
+msgid "There is a new Tweet on your Twitter page"
+msgstr "Es gibt einen neuen Tweet auf Ihrer Twitter-Seite"
+
+msgid "You have {0} new Tweets."
 msgstr "Sie haben {0} Freund Aktualisierungen."
 
-msgid "You don't have any friend updates."
+msgid "There are {0} new Tweets available"
+msgstr "{0} neue Tweets sind verfügbar"
+
+msgid "You have {0} new Tweets on your Twitter"
+msgstr "Sie haben {0} neue Tweets auf Ihrem Twitter"
+
+msgid "I found {0} new Tweets on your Twitter account"
+msgstr "Habe {0} neue Tweets auf Ihrem Twitter-Konto gefunden"
+
+msgid "There are {0} new Tweets on your Twitter page"
+msgstr "Es gibt {0} neue Tweets auf Ihrer Twitter-Seite"
+
+msgid "You don't have any new Tweets."
 msgstr "Sie haben keine Freund Aktualisierungen."
 
+msgid "I couldn't find any new Tweets"
+msgstr "Ich kann keine neuen Tweets finden"
+
+msgid "There are no new Tweets available"
+msgstr "Keine neuen Tweets vorhanden"
+
+msgid "No new Tweets detected"
+msgstr "Keine neuen Tweets gefunden"
+
+msgid "I couldn't detect any new Tweets"
+msgstr "Ich kann keine neuen Tweets finden"
+
 msgid "You don't have any messages"
 msgstr "Sie haben keine Nachrichten."
 
+msgid "You have no private messages"
+msgstr "Sie haben keine privaten Nachrichten"
+
+msgid "I couldn't find any new messages"
+msgstr "Ich kann keine neuen Nachrichten finden"
+
+msgid "There are no new private messages"
+msgstr "Keine privaten Nachrichten"
+
+msgid "No private messages detected"
+msgstr "Keine privaten Nachrichten gefunden"
+
 msgid "You don't have any replies"
 msgstr "Sie haben keine Antworten."
 
+msgid "You have no new replies"
+msgstr "Sie haben keine neuen Antworten"
+
+msgid "There are no replies"
+msgstr "Keinen Antworten"
+
+msgid "I could not find any replies"
+msgstr "Ich konnte keine Antworten finden"
+
+msgid "There are no new replies detected"
+msgstr "Keine neuen Antworten gefunden"
+
 msgid "Your new Tweet was not set, please, try again later"
 msgstr "Ihre neue Tweet wurde nicht hinzugefügt, versuchen Sie es später."
 
 msgid "Your Tweet was added"
 msgstr "Ihre neue Tweet wurde hinzugefügt."
 
-msgid "Twitter is busy for now, please, try later."
+msgid "Twitter is busy for now, please, try again later."
 msgstr "Twitter ist ausgelastet, versuchen Sie es später wieder."
 
 msgid "One reply from {0}"
@@ -78,3 +138,15 @@
 
 msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
 msgstr "Sorry, Bei der Verbindung mit Twitter gab es einen Fehler. Prüfen Sie Ihre Twitter-Konfiguration."
+
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr "Keine Verbindung mit Ihrem Twitter-Konto möglich. Prüfen Sie, ob die Twitter-Funktion korrekt konfiguriert ist."
+
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr "Anscheinend haben Sie ein falsches Twitter-Login oder Kennwort eingegeben. Überprüfen Sie bitte die Konfiguration der Twitter-Funktion."
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr "Habe bei der Verbindung mit Ihrem Twitter-Konto einen Fehler gefunden. Prüfen Sie Login und Kennwort in der Twitter-Konfiguration."
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr "Keine Verbindung mit Ihrem Twitter möglich. Prüfen Sie die richtige Eingabe von Login und Kennwort."

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.wiki
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.wiki	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/de.wiki	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,10 +1,10 @@
-= Übersicht =
-Dieses Plugin liest Ihre Twitter-Nachrichten. Keine Ahnung, was Twitter ist? Infos unter http://www.twitter.com
-
-Nach der Eingabe von Twitter-Login und Kennwort können Sie verschiedene Optionen anpassen:
-* Tweeten Sie Ihren neuen Status: Jedes Mal, wenn diese Funktion gestartet wird, erstellt sie einen neuen Tweet auf Ihrer Twitter-Seite.
-* Tweeten Sie entsprechend dem Statustext: Hier können Sie den Text für den Tweet der obigen Option festlegen.
-* Maximale Tweetanzahl: Die Anzahl der neuesten von Tux Droid vorzulesenden Tweets wählen.
-* Gibt die unter den Followern gegebenen Antworten wieder: Tux Droid liest die unter den Followern gegebenen Antworten vor.
-* Meine Nachrichten/Antworten wiedergeben: Tux Droid liest Ihre eigenen Nachrichten und Antworten auf Twitter vor.
-
+= Übersicht =
+Dieses Plugin liest Ihre Twitter-Nachrichten. Keine Ahnung, was Twitter ist? Infos unter http://www.twitter.com
+
+Nach der Eingabe von Twitter-Login und Kennwort können Sie verschiedene Optionen anpassen:
+* Tweeten Sie Ihren neuen Status: Jedes Mal, wenn diese Funktion gestartet wird, erstellt sie einen neuen Tweet auf Ihrer Twitter-Seite.
+* Tweeten Sie entsprechend dem Statustext: Hier können Sie den Text für den Tweet der obigen Option festlegen.
+* Maximale Tweetanzahl: Die Anzahl der neuesten von Tux Droid vorzulesenden Tweets wählen.
+* Gibt die unter den Followern gegebenen Antworten wieder: Tux Droid liest die unter den Followern gegebenen Antworten vor.
+* Meine Nachrichten/Antworten wiedergeben: Tux Droid liest Ihre eigenen Nachrichten und Antworten auf Twitter vor.
+

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/en.po	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,81 +1,152 @@
-msgid "Twitter Plugin"
-msgstr "Twitter Plugin"
-
-msgid "The Twitter plugin will make Tux Droid check your Twitter account."
-msgstr "The Twitter plugin will make Tux Droid check your Twitter account."
-
-msgid "Username"
-msgstr "Username"
-
-msgid "Password"
-msgstr "Password"
-
-msgid "Tweet your new status"
-msgstr "Tweet my new status"
-
-msgid "Tweet following status text"
-msgstr "Tweet following status text"
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hello all from my Tux Droid Twitter gadget."
-
-msgid "Check Friends updates"
-msgstr "Check for new Tweets"
-
-msgid "Check my messages/replies"
-msgstr "Check my messages/replies"
-
-msgid "Check your Twitter account."
-msgstr "Check my Twitter account."
-
-msgid "Check your tweets from your Twitter account."
-msgstr "Check my Tweets from my Twitter account."
-
-msgid "Start every x"
-msgstr "Alerts"
-
-msgid "Start me every x"
-msgstr "Check my Twitter account automatically"
-
-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."
-
-msgid "You have a new friend update"
-msgstr "There is a new Tweet available."
-
-msgid "You have {0} friend updates"
-msgstr "You have {0} new Tweets."
-
-msgid "You don't have any friend updates."
-msgstr "You don't have any new Tweets."
-
-msgid "You don't have any messages"
-msgstr "You don't have any messages."
-
-msgid "You don't have any replies"
-msgstr "You don't have any replies."
-
-msgid "Your new Tweet was not set, please, try again later"
-msgstr "Your new Tweet was not set, please, try again later."
-
-msgid "Your Tweet was added"
-msgstr "Your Tweet was added."
-
-msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter is busy for now, please, try again later."
-
-msgid "One reply from {0}"
-msgstr "One reply from {0}."
-
-msgid "{0} replies from {1}"
-msgstr "{0} replies from {1}."
-
-msgid "One message from {0}"
-msgstr "One message from {0}."
-
-msgid "{0} messages from {1}"
-msgstr "{0} messages from {1}."
-
-msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
-msgstr "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
-
+msgid "Twitter Plugin"
+msgstr "Twitter Plugin"
+
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr "The Twitter plugin will make Tux Droid check your Twitter account."
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Tweet your new status"
+msgstr "Tweet my new status"
+
+msgid "Tweet following status text"
+msgstr "Tweet following status text"
+
+msgid "Hello all from my Tux Droid Twitter gadget"
+msgstr "Hello all from my Tux Droid Twitter gadget."
+
+msgid "Check Friends updates"
+msgstr "Check for new Tweets"
+
+msgid "Check my messages/replies"
+msgstr "Check my messages/replies"
+
+msgid "Check your Twitter account."
+msgstr "Check my Twitter account."
+
+msgid "Check your tweets from your Twitter account."
+msgstr "Check my Tweets from my Twitter account."
+
+msgid "Start every x"
+msgstr "Alerts"
+
+msgid "Start me every x"
+msgstr "Check my Twitter account automatically"
+
+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."
+
+msgid "There is a new Tweet available."
+msgstr "There is a new Tweet available."
+
+msgid "You have a new Tweet"
+msgstr "You have a new Tweet"
+
+msgid "You have a new Tweet on your Twitter"
+msgstr "You have a new Tweet on your Twitter"
+
+msgid "I found a new Tweet on your Twitter account"
+msgstr "I found a new Tweet on your Twitter account"
+
+msgid "There is a new Tweet on your Twitter page"
+msgstr "There is a new Tweet on your Twitter page"
+
+msgid "You have {0} new Tweets."
+msgstr "You have {0} new Tweets."
+
+msgid "There are {0} new Tweets available"
+msgstr "There are {0} new Tweets available"
+
+msgid "You have {0} new Tweets on your Twitter"
+msgstr "You have {0} new Tweets on your Twitter"
+
+msgid "I found {0} new Tweets on your Twitter account"
+msgstr "I found {0} new Tweets on your Twitter account"
+
+msgid "There are {0} new Tweets on your Twitter page"
+msgstr "There are {0} new Tweets on your Twitter page"
+
+msgid "You don't have any new Tweets."
+msgstr "You don't have any new Tweets."
+
+msgid "I couldn't find any new Tweets"
+msgstr "I couldn't find any new Tweets"
+
+msgid "There are no new Tweets available"
+msgstr "There are no new Tweets available"
+
+msgid "No new Tweets detected"
+msgstr "No new Tweets detected"
+
+msgid "I couldn't detect any new Tweets"
+msgstr "I couldn't detect any new Tweets"
+
+msgid "You don't have any messages"
+msgstr "You don't have any messages."
+
+msgid "You have no private messages"
+msgstr "You have no private messages"
+
+msgid "I couldn't find any new messages"
+msgstr "I couldn't find any new messages"
+
+msgid "There are no new private messages"
+msgstr "There are no new private messages"
+
+msgid "No private messages detected"
+msgstr "No private messages detected"
+
+msgid "You don't have any replies"
+msgstr "You don't have any replies."
+
+msgid "You have no new replies"
+msgstr "You have no new replies"
+
+msgid "There are no replies"
+msgstr "There are no replies"
+
+msgid "I could not find any replies"
+msgstr "I could not find any replies"
+
+msgid "There are no new replies detected"
+msgstr "There are no new replies detected"
+
+msgid "Your new Tweet was not set, please, try again later"
+msgstr "Your new Tweet was not set, please, try again later."
+
+msgid "Your Tweet was added"
+msgstr "Your Tweet was added."
+
+msgid "Twitter is busy for now, please, try again later."
+msgstr "Twitter is busy for now, please, try again later."
+
+msgid "One reply from {0}"
+msgstr "One reply from {0}."
+
+msgid "{0} replies from {1}"
+msgstr "{0} replies from {1}."
+
+msgid "One message from {0}"
+msgstr "One message from {0}."
+
+msgid "{0} messages from {1}"
+msgstr "{0} messages from {1}."
+
+msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+msgstr "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+
+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."
+
+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."
+
+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."
+
+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."

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/fr.po	2009-10-28 16:13:13 UTC (rev 5789)
@@ -16,7 +16,7 @@
 msgid "Tweet following status text"
 msgstr "Tweet à publier"
 
-msgid "Hello all from my Tux Droid twitter gadget"
+msgid "Hello all from my Tux Droid Twitter gadget"
 msgstr "Bonjour à tous à partir du gadget Twitter de mon Tux Droid"
 
 msgid "Check Friends updates"
@@ -28,40 +28,100 @@
 msgid "Check your Twitter account."
 msgstr "Vérifier votre compte Twitter"
 
+msgid "Check your tweets from your Twitter account."
+msgstr "Vérifier vos Tweets"
+
 msgid "Start every x"
 msgstr "Alertes"
 
-msgid "Check your tweets from your Twitter account."
-msgstr "Vérifier vos Tweets"
-
 msgid "Start me every x"
 msgstr "Vérifier automatiquement mon compte Twitter."
 
 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."
 
-msgid "You have a new friend update"
+msgid "There is a new Tweet available."
 msgstr "Un ami à publié un nouveau Tweet"
 
-msgid "You have {0} friend updates"
+msgid "You have a new Tweet"
+msgstr "Vous avez un nouveau Tweet"
+
+msgid "You have a new Tweet on your Twitter"
+msgstr "Vous avez un nouveau Tweet sur Twitter"
+
+msgid "I found a new Tweet on your Twitter account"
+msgstr "J'ai trouvé un nouveau Tweet sur votre compte Twitter"
+
+msgid "There is a new Tweet on your Twitter page"
+msgstr "Il y a un nouveau Tweet sur votre page Twitter"
+
+msgid "You have {0} new Tweets."
 msgstr "{0} de vos amis ont publié un nouveau Tweet"
 
-msgid "You don't have any friend updates."
+msgid "There are {0} new Tweets available"
+msgstr "Il y a {0} nouveaux Tweets disponibles"
+
+msgid "You have {0} new Tweets on your Twitter"
+msgstr "Vous avez {0} nouveaux Tweets sur Twitter"
+
+msgid "I found {0} new Tweets on your Twitter account"
+msgstr "J'ai trouvé {0} nouveaux Tweets sur votre compte Twitter"
+
+msgid "There are {0} new Tweets on your Twitter page"
+msgstr "Il y a {0} nouveaux Tweets sur votre page Twitter"
+
+msgid "You don't have any new Tweets."
 msgstr "Vos amis n'ont pas publié de Tweets"
 
+msgid "I couldn't find any new Tweets"
+msgstr "Je n'ai pas trouvé de nouveaux Tweets "
+
+msgid "There are no new Tweets available"
+msgstr "Il n'y a pas de nouveaux Tweets disponibles"
+
+msgid "No new Tweets detected"
+msgstr "Aucun nouveau Tweet détecté"
+
+msgid "I couldn't detect any new Tweets"
+msgstr "Je n'ai pas détecté de nouveaux Tweets"
+
 msgid "You don't have any messages"
-msgstr "Vous n'avez pas de nouveau messages"
+msgstr "Vous n'avez pas de nouveaux messages"
 
+msgid "You have no private messages"
+msgstr "Vous n'avez pas de messages privés"
+
+msgid "I couldn't find any new messages"
+msgstr "Je n'ai pas trouvé de nouveaux messages"
+
+msgid "There are no new private messages"
+msgstr "Il n'y a pas de nouveaux messages privés"
+
+msgid "No private messages detected"
+msgstr "Aucun message privé détecté"
+
 msgid "You don't have any replies"
 msgstr "Vous n'avez pas de nouvelles réponses"
 
+msgid "You have no new replies"
+msgstr "Vous n'avez pas de réponses"
+
+msgid "There are no replies"
+msgstr "Il n'y a pas de réponses"
+
+msgid "I could not find any replies"
+msgstr "Je n'ai pas trouvé de réponses"
+
+msgid "There are no new replies detected"
+msgstr "Aucune nouvelles réponses détectées"
+
 msgid "Your new Tweet was not set, please, try again later"
 msgstr "Votre Tweet n'a pas été publié, s'il vous plait, essayez à nouveau."
 
 msgid "Your Tweet was added"
 msgstr "Votre Tweet a été publié"
 
-msgid "Twitter is busy for now, please, try later."
+msgid "Twitter is busy for now, please, try again later."
 msgstr "Twitter est occupé pour le moment, veuillez réessayer plus tard."
 
 msgid "One reply from {0}"
@@ -79,4 +139,14 @@
 msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
 msgstr "Désolé, il y a eu une erreur lors de la connexion avec Twitter. Vérifiez votre login et votre mot de passe"
 
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr "Je ne peux pas me connecter à votre compte Twitter. Veuillez vérifier que le gadget Twitter soit configuré correctement."
 
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr "Il semble que vous ayez entré un mauvais nom d'utilisateur ou mot de passe Twitter. Veuillez vérifier la configuration du gadget Twitter."
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr "J'ai eu une erreur en essayant de me connecter à votre compte Twitter. Veuillez vérifier votre nom d'utilisateur et mode de passe dans la configuration du gadget Twitter."
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr "Je n'ai pas pu le connecter à votre Twitter. Assurez-vous que vous avez entré un nom d'utilisateur et un mot de passe correct."

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/nl.po	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,80 +1,152 @@
-msgid "Twitter Plugin"
-msgstr "Twitter Plugin"
-
-msgid "The Twitter plugin will make Tux Droid check your Twitter account."
-msgstr "De Twitter plugin zal Tux Droid je Twitter account laten checken."
-
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-msgid "Password"
-msgstr "Wachtwoord"
-
-msgid "Tweet your new status"
-msgstr "Tweet je nieuwe status"
-
-msgid "Tweet following status text"
-msgstr "Tweet volgende status tekst"
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
-
-msgid "Check Friends updates"
-msgstr "Check nieuwe Tweets"
-
-msgid "Check my messages/replies"
-msgstr "Check mijn berichten/ antwoorden"
-
-msgid "Check your Twitter account."
-msgstr "Check mijn Twitter account."
-
-msgid "Check your tweets from your Twitter account."
-msgstr "Check mijn Tweets op mijn Twitter account."
-
-msgid "Start every x"
-msgstr "Alarmen"
-
-msgid "Start me every x"
-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."
-
-msgid "You have a new friend update"
-msgstr "Er is een nieuwe Tweet beschikbaar."
-
-msgid "You have {0} friend updates"
-msgstr "Je hebt {0} nieuwe Tweets."
-
-msgid "You don't have any friend updates."
-msgstr "Je hebt geen nieuwe Tweets."
-
-msgid "You don't have any messages"
-msgstr "Je hebt geen nieuwe berichten."
-
-msgid "You don't have any replies"
-msgstr "Je hebt geen nieuwe antwoorden."
-
-msgid "Your new Tweet was not set, please, try again later"
-msgstr "Je nieuwe Tweet werd niet geplaatst, probeer later opnieuw."
-
-msgid "Your Tweet was added"
-msgstr "Je nieuwe Tweet werd toegevoegd."
-
-msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter is bezet op het ogenblik, probeer later opnieuw."
-
-msgid "One reply from {0}"
-msgstr "Je hebt 1 antwoord van {0}."
-
-msgid "{0} replies from {1}"
-msgstr "{0} antwoorden van {1}."
-
-msgid "One message from {0}"
-msgstr "1 bericht van {0}."
-
-msgid "{0} messages from {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 "Twitter Plugin"
+msgstr "Twitter Plugin"
+
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr "De Twitter plugin zal Tux Droid je Twitter account laten checken."
+
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgid "Tweet your new status"
+msgstr "Tweet je nieuwe status"
+
+msgid "Tweet following status text"
+msgstr "Tweet volgende status tekst"
+
+msgid "Hello all from my Tux Droid Twitter gadget"
+msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
+
+msgid "Check Friends updates"
+msgstr "Check nieuwe Tweets"
+
+msgid "Check my messages/replies"
+msgstr "Check mijn berichten/ antwoorden"
+
+msgid "Check your Twitter account."
+msgstr "Check mijn Twitter account."
+
+msgid "Check your tweets from your Twitter account."
+msgstr "Check mijn Tweets op mijn Twitter account."
+
+msgid "Start every x"
+msgstr "Alarmen"
+
+msgid "Start me every x"
+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 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 "Je hebt een nieuwe Tweet beschikbaar"
+
+msgid "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 "Ik heb een nieuwe Tweet gevonden op je Twitter account"
+
+msgid "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 Tweet beschikbaar."
+
+msgid "There are {0} new Tweets available"
+msgstr "Er zijn {0} nieuwe Tweet beschikbaar"
+
+msgid "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 "Ik heb {0} nieuwe Tweet gevonden op je Twitter account"
+
+msgid "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 Tweet beschikbaar"
+
+msgid "I couldn't find any new Tweets"
+msgstr "Ik heb geen nieuwe Tweet gevonden"
+
+msgid "There are no new Tweets available"
+msgstr "Er zijn geen nieuwe Tweet beschikbaar"
+
+msgid "No new Tweets detected"
+msgstr "Geen nieuwe Tweet gevonden"
+
+msgid "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"
+
+msgid "You have no private messages"
+msgstr "Je hebt geen persoonlijke berichten"
+
+msgid "I couldn't find any new messages"
+msgstr "Ik kan geen nieuwe berichten vinden"
+
+msgid "There are no new private messages"
+msgstr "Er zijn geen nieuwe persoonlijke berichten"
+
+msgid "No private messages detected"
+msgstr "Geen persoonlijke berichten gevonden"
+
+msgid "You don't have any replies"
+msgstr "Je hebt geen nieuwe antwoorden"
+
+msgid "You have no new replies"
+msgstr "Je hebt geen antwoorden"
+
+msgid "There are no replies"
+msgstr "Er zijn geen antwoorden"
+
+msgid "I could not find any replies"
+msgstr "Ik heb geen antwoorden gevonden"
+
+msgid "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"
+
+msgid "Your Tweet was added"
+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}"
+
+msgid "{0} replies from {1}"
+msgstr "{0} antwoorden van {1}"
+
+msgid "One message from {0}"
+msgstr "1 bericht van {0}"
+
+msgid "{0} messages from {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 "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 "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 "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 "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/trunk/plugin-twitter/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.pot	2009-10-28 16:13:13 UTC (rev 5789)
@@ -16,7 +16,7 @@
 msgid "Tweet following status text"
 msgstr ""
 
-msgid "Hello all from my Tux Droid twitter gadget"
+msgid "Hello all from my Tux Droid Twitter gadget"
 msgstr ""
 
 msgid "Check Friends updates"
@@ -40,28 +40,88 @@
 msgid "You do not seem to be connected. Please, verify you username and password, then try again."
 msgstr ""
 
-msgid "You have a new friend update"
+msgid "There is a new Tweet available."
 msgstr ""
 
-msgid "You have {0} friend updates"
+msgid "You have a new Tweet"
 msgstr ""
 
-msgid "You don't have any friend updates."
+msgid "You have a new Tweet on your Twitter"
 msgstr ""
 
+msgid "I found a new Tweet on your Twitter account"
+msgstr ""
+
+msgid "There is a new Tweet on your Twitter page"
+msgstr ""
+
+msgid "You have {0} new Tweets."
+msgstr ""
+
+msgid "There are {0} new Tweets available"
+msgstr ""
+
+msgid "You have {0} new Tweets on your Twitter"
+msgstr ""
+
+msgid "I found {0} new Tweets on your Twitter account"
+msgstr ""
+
+msgid "There are {0} new Tweets on your Twitter page"
+msgstr ""
+
+msgid "You don't have any new Tweets."
+msgstr ""
+
+msgid "I couldn't find any new Tweets"
+msgstr ""
+
+msgid "There are no new Tweets available"
+msgstr ""
+
+msgid "No new Tweets detected"
+msgstr ""
+
+msgid "I couldn't detect any new Tweets"
+msgstr ""
+
 msgid "You don't have any messages"
 msgstr ""
 
+msgid "You have no private messages"
+msgstr ""
+
+msgid "I couldn't find any new messages"
+msgstr ""
+
+msgid "There are no new private messages"
+msgstr ""
+
+msgid "No private messages detected"
+msgstr ""
+
 msgid "You don't have any replies"
 msgstr ""
 
+msgid "You have no new replies"
+msgstr ""
+
+msgid "There are no replies"
+msgstr ""
+
+msgid "I could not find any replies"
+msgstr ""
+
+msgid "There are no new replies detected"
+msgstr ""
+
 msgid "Your new Tweet was not set, please, try again later"
 msgstr ""
 
 msgid "Your Tweet was added"
 msgstr ""
 
-msgid "Twitter is busy for now, please, try later."
+msgid "Twitter is busy for now, please, try again later."
 msgstr ""
 
 msgid "One reply from {0}"
@@ -79,3 +139,14 @@
 msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
 msgstr ""
 
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr ""
+
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr ""
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr ""
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr ""

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/resources/plugin.xml	2009-10-28 16:13:13 UTC (rev 5789)
@@ -39,7 +39,7 @@
 			name="myStatus"
 			description="Tweet following status text"
 			type="string"
-			defaultValue="Hello all from my Tux Droid twitter gadget" />
+			defaultValue="Hello all from my Tux Droid Twitter gadget" />
 		<parameter
 			category="User parameters"
 			name="checkFriends"

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Configuration.java	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,168 +1,168 @@
-/* This file is part of "Tux Droid Gadget Twitter".
- *    Copyright 2008, kysoh
- *    Author : Jerome Conan
- *    Site   : http://www.kysoh.com/
- *
- * "Tux Droid Gadget Twitter" 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.
- *
- * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
- */
-
-
-import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration;
-
-
-public class Configuration extends SimplePluginConfiguration{
-
-	private String username = "";
-	private String password = "";
-	
-	private String myStatus = "Hello all from my tuxdroid Twitter gadget";
-	private boolean updateStatus = false;
-	
-	private boolean checkFriends = true;
-	private boolean checkMessages = true;
-	
-	private String defaultUser = "your_user_name";
-	private String defaultPassword = "_secret_";
-	
-	
-	/**
-	 * Sets the username.
-	 * @param username
-	 */
-	public void setUsername(String username)
-	{
-		this.username = username;
-	}
-	
-	
-	/**
-	 * Return the username.
-	 * @return
-	 */
-	public String getUsername()
-	{
-		if (this.username.equalsIgnoreCase(this.defaultUser))
-		{
-			return null;
-		}
-		
-		return this.username;
-	}
-	
-	
-	/**
-	 * Set the user password.
-	 * @param password
-	 */
-	public void setPassword(String password)
-	{
-		this.password = password;
-	}
-	
-	
-	/**
-	 * Return the user password.
-	 * @return
-	 */
-	public String getPassword()
-	{
-		if (this.password.equalsIgnoreCase(this.defaultPassword))
-		{
-			return null;
-		}
-		return this.password;
-	}
-	
-	
-	/**
-	 * Sets the user status on twitter.
-	 */
-	public void setMyStatus(String myStatus)
-	{
-		this.myStatus = myStatus;
-	}
-	
-	
-	/**
-	 * Return the status to be set.
-	 * @return
-	 */
-	public String getMyStatus()
-	{
-		return this.myStatus;
-	}
-	
-	
-	/**
-	 * Set or not the update request.
-	 * @param updateStatus
-	 */
-	public void setUpdateStatus(boolean updateStatus)
-	{
-		this.updateStatus = updateStatus;
-	}
-	
-	
-	/**
-	 * Return true if user want to update his status.
-	 * @return
-	 */
-	public boolean getUpdateStatus()
-	{
-		return this.updateStatus;
-	}
-	
-	
-	/**
-	 * Set or not the checkf friends updates check.
-	 * @param updateStatus
-	 */
-	public void setCheckFriends(boolean aCheckFriends)
-	{
-		this.checkFriends = aCheckFriends;
-	}
-	
-	
-	/**
-	 * Return true if user want to check his new friends statuses.
-	 * @return
-	 */
-	public boolean getCheckFriends()
-	{
-		return this.checkFriends;
-	}
-	
-	
-	/**
-	 * Set or not the check messages option.
-	 * @param updateStatus
-	 */
-	public void setCheckMessages(boolean aCheckMessages)
-	{
-		this.checkMessages = aCheckMessages;
-	}
-	
-	
-	/**
-	 * Return true if user want to check his replies / messages.
-	 * @return
-	 */
-	public boolean getCheckMessages()
-	{
-		return this.checkMessages;
-	}
-
-}
+/* This file is part of "Tux Droid Gadget Twitter".
+ *    Copyright 2008, kysoh
+ *    Author : Jerome Conan
+ *    Site   : http://www.kysoh.com/
+ *
+ * "Tux Droid Gadget Twitter" 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.
+ *
+ * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
+ */
+
+
+import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration;
+
+
+public class Configuration extends SimplePluginConfiguration{
+
+    private String username = "";
+    private String password = "";
+
+    private String myStatus = "Hello all from my tuxdroid Twitter gadget";
+    private boolean updateStatus = false;
+
+    private boolean checkFriends = true;
+    private boolean checkMessages = true;
+
+    private String defaultUser = "your_user_name";
+    private String defaultPassword = "_secret_";
+
+
+    /**
+     * Sets the username.
+     * @param username
+     */
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+
+    /**
+     * Return the username.
+     * @return
+     */
+    public String getUsername()
+    {
+        if (this.username.equalsIgnoreCase(this.defaultUser))
+        {
+            return null;
+        }
+
+        return this.username;
+    }
+
+
+    /**
+     * Set the user password.
+     * @param password
+     */
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+
+    /**
+     * Return the user password.
+     * @return
+     */
+    public String getPassword()
+    {
+        if (this.password.equalsIgnoreCase(this.defaultPassword))
+        {
+            return null;
+        }
+        return this.password;
+    }
+
+
+    /**
+     * Sets the user status on twitter.
+     */
+    public void setMyStatus(String myStatus)
+    {
+        this.myStatus = myStatus;
+    }
+
+
+    /**
+     * Return the status to be set.
+     * @return
+     */
+    public String getMyStatus()
+    {
+        return this.myStatus;
+    }
+
+
+    /**
+     * Set or not the update request.
+     * @param updateStatus
+     */
+    public void setUpdateStatus(boolean updateStatus)
+    {
+        this.updateStatus = updateStatus;
+    }
+
+
+    /**
+     * Return true if user want to update his status.
+     * @return
+     */
+    public boolean getUpdateStatus()
+    {
+        return this.updateStatus;
+    }
+
+
+    /**
+     * Set or not the checkf friends updates check.
+     * @param updateStatus
+     */
+    public void setCheckFriends(boolean aCheckFriends)
+    {
+        this.checkFriends = aCheckFriends;
+    }
+
+
+    /**
+     * Return true if user want to check his new friends statuses.
+     * @return
+     */
+    public boolean getCheckFriends()
+    {
+        return this.checkFriends;
+    }
+
+
+    /**
+     * Set or not the check messages option.
+     * @param updateStatus
+     */
+    public void setCheckMessages(boolean aCheckMessages)
+    {
+        this.checkMessages = aCheckMessages;
+    }
+
+
+    /**
+     * Return true if user want to check his replies / messages.
+     * @return
+     */
+    public boolean getCheckMessages()
+    {
+        return this.checkMessages;
+    }
+
+}

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/FriendStatut.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/FriendStatut.java	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/FriendStatut.java	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,81 +1,81 @@
-/* This file is part of "Tux Droid Gadget Twitter".
- *    Copyright 2008, kysoh
- *    Author : Jerome Conan
- *    Site   : http://www.kysoh.com/
- *
- * "Tux Droid Gadget Twitter" 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.
- *
- * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
- */
-
-import java.io.Serializable;
-
-public class FriendStatut implements Serializable{
-
-	private static final long serialVersionUID = -2710016821846315218L;
-
-	private String friend = null;
-	private String Status = null;
-	
-	/**
-	 * Constructor.
-	 * @param friendName
-	 * @param status
-	 */
-	public FriendStatut(String friendName, String status)
-	{
-		this.friend = friendName;
-		this.Status = status;
-	}
-	
-	
-	/**
-	 * Return the friend name.
-	 * @return
-	 */
-	public String getFriendName()
-	{
-		return this.friend;
-	}
-	
-	
-	/**
-	 * Return the friend status.
-	 * @return
-	 */
-	public String getFriendStatus()
-	{
-		return this.Status;
-	}
-	
-	
-	/**
-	 * Set the friend name.
-	 * @param aFriendName
-	 */
-	public void setFriendName(String aFriendName)
-	{
-		this.friend = aFriendName;
-	}
-	
-	
-	/**
-	 * Set the friend status.
-	 * @param aFriendStatus
-	 */
-	public void setFriendStatus(String aFriendStatus)
-	{
-		this.Status = aFriendStatus;
-	}
-}
+/* This file is part of "Tux Droid Gadget Twitter".
+ *    Copyright 2008, kysoh
+ *    Author : Jerome Conan
+ *    Site   : http://www.kysoh.com/
+ *
+ * "Tux Droid Gadget Twitter" 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.
+ *
+ * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
+ */
+
+import java.io.Serializable;
+
+public class FriendStatut implements Serializable{
+
+    private static final long serialVersionUID = -2710016821846315218L;
+
+    private String friend = null;
+    private String Status = null;
+
+    /**
+     * Constructor.
+     * @param friendName
+     * @param status
+     */
+    public FriendStatut(String friendName, String status)
+    {
+        this.friend = friendName;
+        this.Status = status;
+    }
+
+
+    /**
+     * Return the friend name.
+     * @return
+     */
+    public String getFriendName()
+    {
+        return this.friend;
+    }
+
+
+    /**
+     * Return the friend status.
+     * @return
+     */
+    public String getFriendStatus()
+    {
+        return this.Status;
+    }
+
+
+    /**
+     * Set the friend name.
+     * @param aFriendName
+     */
+    public void setFriendName(String aFriendName)
+    {
+        this.friend = aFriendName;
+    }
+
+
+    /**
+     * Set the friend status.
+     * @param aFriendStatus
+     */
+    public void setFriendStatus(String aFriendStatus)
+    {
+        this.Status = aFriendStatus;
+    }
+}

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Message.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Message.java	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Message.java	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,82 +1,82 @@
-/* This file is part of "Tux Droid Gadget Twitter".
- *    Copyright 2008, kysoh
- *    Author : Jerome Conan
- *    Site   : http://www.kysoh.com/
- *
- * "Tux Droid Gadget Twitter" 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.
- *
- * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
- */
-
-import java.io.Serializable;
-
-public class Message implements Serializable{
-
-	private static final long serialVersionUID = -2723363051271966964L;
-
-	private String sender = null;
-	private String message = null;
-	
-	/**
-	 * Constructor.
-	 * @param sender
-	 * @param message
-	 */
-	public Message(String sender, String message)
-	{
-		this.sender = sender;
-		this.message = message;
-	}
-	
-	
-	/**
-	 * Return the message sender.
-	 * @return
-	 */
-	public String getSender()
-	{
-		return this.sender;
-	}
-	
-	
-	/**
-	 * Return the message itself.
-	 * @return
-	 */
-	public String getMessage()
-	{
-		return this.message;
-	}
-	
-	
-	/**
-	 * Set the message.
-	 * @param aMessage
-	 */
-	public void setMessage(String aMessage)
-	{
-		this.message = aMessage;
-	}
-	
-	
-	/**
-	 * Set the sender.
-	 * @param aSender
-	 */
-	public void setSender(String aSender)
-	{
-		this.sender = aSender;
-	}
-	
-}
+/* This file is part of "Tux Droid Gadget Twitter".
+ *    Copyright 2008, kysoh
+ *    Author : Jerome Conan
+ *    Site   : http://www.kysoh.com/
+ *
+ * "Tux Droid Gadget Twitter" 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.
+ *
+ * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
+ */
+
+import java.io.Serializable;
+
+public class Message implements Serializable{
+
+    private static final long serialVersionUID = -2723363051271966964L;
+
+    private String sender = null;
+    private String message = null;
+
+    /**
+     * Constructor.
+     * @param sender
+     * @param message
+     */
+    public Message(String sender, String message)
+    {
+        this.sender = sender;
+        this.message = message;
+    }
+
+
+    /**
+     * Return the message sender.
+     * @return
+     */
+    public String getSender()
+    {
+        return this.sender;
+    }
+
+
+    /**
+     * Return the message itself.
+     * @return
+     */
+    public String getMessage()
+    {
+        return this.message;
+    }
+
+
+    /**
+     * Set the message.
+     * @param aMessage
+     */
+    public void setMessage(String aMessage)
+    {
+        this.message = aMessage;
+    }
+
+
+    /**
+     * Set the sender.
+     * @param aSender
+     */
+    public void setSender(String aSender)
+    {
+        this.sender = aSender;
+    }
+
+}

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Reply.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Reply.java	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/Reply.java	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,81 +1,81 @@
-/* This file is part of "Tux Droid Gadget Twitter".
- *    Copyright 2008, kysoh
- *    Author : Jerome Conan
- *    Site   : http://www.kysoh.com/
- *
- * "Tux Droid Gadget Twitter" 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.
- *
- * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
- */
-
-import java.io.Serializable;
-
-public class Reply implements Serializable{
-
-	private static final long serialVersionUID = -4131206164350955300L;
-
-	private String sender = null;
-	private String reply = null;
-	
-	/**
-	 * Constructor.
-	 * @param sender
-	 * @param reply
-	 */
-	public Reply(String sender, String reply)
-	{
-		this.sender = sender;
-		this.reply = reply;
-	}
-	
-	
-	/**
-	 * Return the reply sender.
-	 * @return
-	 */
-	public String getSender()
-	{
-		return this.sender;
-	}
-	
-	
-	/**
-	 * Return the reply itself.
-	 * @return
-	 */
-	public String getReply()
-	{
-		return this.reply;
-	}
-	
-	
-	/**
-	 * Set the reply sender.
-	 * @param aSender
-	 */
-	public void setSender(String aSender)
-	{
-		this.sender = aSender;
-	}
-	
-	
-	/**
-	 * Set the message itself.
-	 * @param aReply
-	 */
-	public void setReply(String aReply)
-	{
-		this.reply = aReply;
-	}
-}
+/* This file is part of "Tux Droid Gadget Twitter".
+ *    Copyright 2008, kysoh
+ *    Author : Jerome Conan
+ *    Site   : http://www.kysoh.com/
+ *
+ * "Tux Droid Gadget Twitter" 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.
+ *
+ * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
+ */
+
+import java.io.Serializable;
+
+public class Reply implements Serializable{
+
+    private static final long serialVersionUID = -4131206164350955300L;
+
+    private String sender = null;
+    private String reply = null;
+
+    /**
+     * Constructor.
+     * @param sender
+     * @param reply
+     */
+    public Reply(String sender, String reply)
+    {
+        this.sender = sender;
+        this.reply = reply;
+    }
+
+
+    /**
+     * Return the reply sender.
+     * @return
+     */
+    public String getSender()
+    {
+        return this.sender;
+    }
+
+
+    /**
+     * Return the reply itself.
+     * @return
+     */
+    public String getReply()
+    {
+        return this.reply;
+    }
+
+
+    /**
+     * Set the reply sender.
+     * @param aSender
+     */
+    public void setSender(String aSender)
+    {
+        this.sender = aSender;
+    }
+
+
+    /**
+     * Set the message itself.
+     * @param aReply
+     */
+    public void setReply(String aReply)
+    {
+        this.reply = aReply;
+    }
+}

Modified: software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/TwitterDatasStruct.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/TwitterDatasStruct.java	2009-10-28 15:05:38 UTC (rev 5788)
+++ software_suite_v3/software/plugin/plugin-twitter/trunk/plugin-twitter/src/TwitterDatasStruct.java	2009-10-28 16:13:13 UTC (rev 5789)
@@ -1,312 +1,312 @@
-/* This file is part of "Tux Droid Gadget Twitter".
- *    Copyright 2008, kysoh
- *    Author : Jerome Conan
- *    Site   : http://www.kysoh.com/
- *
- * "Tux Droid Gadget Twitter" 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.
- *
- * "Tux Droid Gadget Twitter" 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 "Tux Droid Gadget Twitter"; 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.
- */
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Vector;
-
-
-public class TwitterDatasStruct extends Object implements Serializable{
-
-	private static final long serialVersionUID = 8395814134877723558L;
-	
-	public static final byte FRIENDS_STATUSES = 0;
-	public static final byte REPLIES = 1;
-	public static final byte MESSAGES = 2;
-	
-	public SerializedVector vktStruct;
-	private File structFile;
-	private boolean firstCycle;
-	
-	
-	
-	public TwitterDatasStruct(String username)
-	{
-		//tds = tuxdroid datas saved.
-		
-		File path = new File("");
-		structFile = new File( path.getAbsolutePath() + File.separator + username + "@twitter.sav");
-		
-		if(structFile.exists())
-		{
-			//Getting serialized object struct.
-			this.firstCycle = false;
-			vktStruct = this.loadStruct();
-		}
-		else
-		{
-			this.firstCycle = true;
-			//Create struct.
-			vktStruct = new SerializedVector();
-			if(vktStruct == null)
-			{
-				vktStruct = new SerializedVector();
-			}
-		}
-	}
-	
-	
-	/**
-	 * Regiter the structure.
-	 */
-	public void registerStruct()
-	{
-		if(this.vktStruct.size() <= 0)
-		{
-			return;
-		}
-		
-		try 
-		{  
-		    FileOutputStream file = new FileOutputStream(this.structFile);  
-		    ObjectOutputStream oos = new ObjectOutputStream(file);  
-		    oos.writeObject(this.vktStruct);  
-		    oos.flush();  
-		    oos.close();  
-		 }  
-		 catch (java.io.IOException e) 
-		 {  
-		      e.printStackTrace();  
-		 }  
-	}
-	
-	
-	
-	/**
-	 * Load the twitterDatasStruct object.
-	 */
-	private SerializedVector loadStruct()
-	{
-		try 
-		{  
-		    FileInputStream fichier = new FileInputStream(this.structFile);  
-		    ObjectInputStream ois = new ObjectInputStream(fichier);  
-		    return (SerializedVector) ois.readObject();  
-		 }   
-		 catch (java.io.IOException e) 
-		 {  
-		      e.printStackTrace();  
-		 }  
-		 catch (ClassNotFoundException e) 
-		 {  
-		      e.printStackTrace();  
-		 }  
-		 return null;
-	}
-	
-	
-	/**
-	 * Add a message to the message hashtable.
-	 * @param sender
-	 * @param message
-	 */
-	public void addMessage(String sender, String message)
-	{
-		this.vktStruct.addMessage(sender, message);
-	}
-	
-	
-	/**
-	 * Add a reply to the reply hashtable.
-	 * @param sender
-	 * @param reply
-	 */
-	public void addReply(String sender, String reply)
-	{
-		this.vktStruct.addReply(sender, reply);
-	}
-	
-	
-	/**
-	 * Add a status for selected friend.
-	 * @param friens
-	 * @param status
-	 */
-	public void addFriendStatus(String friend, String status)
-	{
-		this.vktStruct.addFriendStatus(friend, status);
-	}
-	
-	
-	
-	/**
-	 * This function return the state of cycle ( first start or not for the current user ).
-	 * @return
-	 */
-	public boolean isFirstCycle()
-	{
-		return this.firstCycle;
-	}
-	
-	/**
-	 * Return true if the target is registered.
-	 * @param list
-	 * @param sender
-	 * @param value
-	 * @return
-	 */
-	public boolean isRegistered(byte list, String sender, String value)
-	{
-		
-		switch(list)
-		{
-			case TwitterDatasStruct.FRIENDS_STATUSES:
-			{
-				for(int index=0; index < this.vktStruct.size(); index ++)
-				{
-					if(this.vktStruct.isFriendStatut(index))
-					{
-						FriendStatut friendStatus = (FriendStatut)this.vktStruct.get(index);
-						if(friendStatus.getFriendName().equals(sender))
-						{
-							if(friendStatus.getFriendStatus().equals(value))
-							{
-								return true;
-							}
-						}
-					}
-				}
-			}
-			
-			case TwitterDatasStruct.MESSAGES:
-			{
-				for(int index=0; index < this.vktStruct.size(); index ++)
-				{
-					if(this.vktStruct.isMessage(index))
-					{
-						Message message = (Message) this.vktStruct.get(index);
-						if(message.getSender().equals(sender))
-						{
-							if(message.getMessage().equals(value))
-							{
-								return true;
-							}
-						}
-					}
-				}
-			}
-			
-			case TwitterDatasStruct.REPLIES:
-			{
-				for(int index=0; index < this.vktStruct.size(); index ++)
-				{
-					if(this.vktStruct.isReply(index))
-					{
-						Reply reply = (Reply) this.vktStruct.get(index);
-						if(reply.getSender().equals(sender))
-						{
-							if(reply.getReply().equals(value))
-							{
-								return true;
-							}
-						}
...
 
[truncated message content]

[tuxdroid-svn] r5788 - software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 16:05:38 +0100 (Wed, 28 Oct 2009)
New Revision: 5788

Modified:
   software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po
Log:
* Fixed two german string


Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po	2009-10-28 14:48:39 UTC (rev 5787)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po	2009-10-28 15:05:38 UTC (rev 5788)
@@ -14,7 +14,7 @@
 msgstr "Es ist {0} Uhr {1}."
 
 msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
-msgstr "Beim nächsten Beep ist es genau {0} Uhr {1} ... BIP !"
+msgstr "Beim nächsten Beep ist es genau {0} Uhr {1} ... BEEP !"
 
 msgid "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
 msgstr "Beim nächsten Beep ist es genau {0} Uhr und {1} Minuten ... BEEP !"
@@ -56,7 +56,7 @@
 msgstr "Es ist Viertel vor {0}"
 
 msgid "It's half past {0}"
-msgstr "Es ist {0} Uhr dreißig"
+msgstr "Es ist halb {0}"
 
 msgid "Start every x from full hour"
 msgstr "Hinweise"

[tuxdroid-svn] r5787 - software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 15:48:39 +0100 (Wed, 28 Oct 2009)
New Revision: 5787

Modified:
   software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po
Log:
* Typo ...


Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po	2009-10-28 13:46:12 UTC (rev 5786)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po	2009-10-28 14:48:39 UTC (rev 5787)
@@ -86,7 +86,7 @@
 msgstr "Je n'ai pas détecté de nouveaux Tweets"
 
 msgid "You don't have any messages"
-msgstr "Vous n'avez pas de nouveau messages"
+msgstr "Vous n'avez pas de nouveaux messages"
 
 msgid "You have no private messages"
 msgstr "Vous n'avez pas de messages privés"

[tuxdroid-svn] r5784 - software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 14:33:11 +0100 (Wed, 28 Oct 2009)
New Revision: 5784

Modified:
   software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po
Log:
* Added german translations


Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po	2009-10-28 13:32:37 UTC (rev 5783)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po	2009-10-28 13:33:11 UTC (rev 5784)
@@ -44,76 +44,76 @@
 msgstr "Sie haben eine neue Freund Aktualisierung."
 
 msgid "You have a new Tweet"
-msgstr "You have a new Tweet"
+msgstr "Sie haben einen neuen Tweet."
 
 msgid "You have a new Tweet on your Twitter"
-msgstr "You have a new Tweet on your Twitter"
+msgstr "Sie haben einen neuen Tweet auf Ihrem Twitter"
 
 msgid "I found a new Tweet on your Twitter account"
-msgstr "I found a new Tweet on your Twitter account"
+msgstr "Ich habe einen neuen Tweet auf Ihrem Twitter-Konto gefunden"
 
 msgid "There is a new Tweet on your Twitter page"
-msgstr "There is a new Tweet on your Twitter page"
+msgstr "Es gibt einen neuen Tweet auf Ihrer Twitter-Seite"
 
 msgid "You have {0} new Tweets."
 msgstr "Sie haben {0} Freund Aktualisierungen."
 
 msgid "There are {0} new Tweets available"
-msgstr "There are {0} new Tweets available"
+msgstr "{0} neue Tweets sind verfügbar"
 
 msgid "You have {0} new Tweets on your Twitter"
-msgstr "You have {0} new Tweets on your Twitter"
+msgstr "Sie haben {0} neue Tweets auf Ihrem Twitter"
 
 msgid "I found {0} new Tweets on your Twitter account"
-msgstr "I found {0} new Tweets on your Twitter account"
+msgstr "Habe {0} neue Tweets auf Ihrem Twitter-Konto gefunden"
 
 msgid "There are {0} new Tweets on your Twitter page"
-msgstr "There are {0} new Tweets on your Twitter page"
+msgstr "Es gibt {0} neue Tweets auf Ihrer Twitter-Seite"
 
 msgid "You don't have any new Tweets."
 msgstr "Sie haben keine Freund Aktualisierungen."
 
 msgid "I couldn't find any new Tweets"
-msgstr "I couldn't find any new Tweets"
+msgstr "Ich kann keine neuen Tweets finden"
 
 msgid "There are no new Tweets available"
-msgstr "There are no new Tweets available"
+msgstr "Keine neuen Tweets vorhanden"
 
 msgid "No new Tweets detected"
-msgstr "No new Tweets detected"
+msgstr "Keine neuen Tweets gefunden"
 
 msgid "I couldn't detect any new Tweets"
-msgstr "I couldn't detect any new Tweets"
+msgstr "Ich kann keine neuen Tweets finden"
 
 msgid "You don't have any messages"
 msgstr "Sie haben keine Nachrichten."
 
 msgid "You have no private messages"
-msgstr "You have no private messages"
+msgstr "Sie haben keine privaten Nachrichten"
 
 msgid "I couldn't find any new messages"
-msgstr "I couldn't find any new messages"
+msgstr "Ich kann keine neuen Nachrichten finden"
 
 msgid "There are no new private messages"
-msgstr "There are no new private messages"
+msgstr "Keine privaten Nachrichten"
 
 msgid "No private messages detected"
-msgstr "No private messages detected"
+msgstr "Keine privaten Nachrichten gefunden"
 
 msgid "You don't have any replies"
 msgstr "Sie haben keine Antworten."
 
 msgid "You have no new replies"
-msgstr "You have no new replies"
+msgstr "Sie haben keine neuen Antworten"
 
 msgid "There are no replies"
-msgstr "There are no replies"
+msgstr "Keinen Antworten"
 
 msgid "I could not find any replies"
-msgstr "I could not find any replies"
+msgstr "Ich konnte keine Antworten finden"
 
 msgid "There are no new replies detected"
-msgstr "There are no new replies detected"
+msgstr "Keine neuen Antworten gefunden"
 
 msgid "Your new Tweet was not set, please, try again later"
 msgstr "Ihre neue Tweet wurde nicht hinzugefügt, versuchen Sie es später."
@@ -140,13 +140,13 @@
 msgstr "Sorry, Bei der Verbindung mit Twitter gab es einen Fehler. Prüfen Sie Ihre Twitter-Konfiguration."
 
 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 "Keine Verbindung mit Ihrem Twitter-Konto möglich. Prüfen Sie, ob die Twitter-Funktion korrekt konfiguriert ist."
 
 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 "Anscheinend haben Sie ein falsches Twitter-Login oder Kennwort eingegeben. Überprüfen Sie bitte die Konfiguration der Twitter-Funktion."
 
 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 "Habe bei der Verbindung mit Ihrem Twitter-Konto einen Fehler gefunden. Prüfen Sie Login und Kennwort in der Twitter-Konfiguration."
 
 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 "Keine Verbindung mit Ihrem Twitter möglich. Prüfen Sie die richtige Eingabe von Login und Kennwort."

[tuxdroid-svn] r5783 - software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 14:32:37 +0100 (Wed, 28 Oct 2009)
New Revision: 5783

Modified:
   software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po
Log:
* Added the german translations


Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po	2009-10-28 13:32:08 UTC (rev 5782)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po	2009-10-28 13:32:37 UTC (rev 5783)
@@ -45,55 +45,55 @@
 msgstr "Sie haben eine neue Email."
 
 msgid "A new mail has arrived !"
-msgstr "A new mail has arrived !"
+msgstr "Eine neue Mail ist eingetroffen!"
 
 msgid "It appears you have received a new email."
-msgstr "It appears you have received a new email."
+msgstr "Anscheinend haben Sie eine neue E-Mail erhalten."
 
 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 "Eine neue E-Mail? Ich frage mich, wer gerade an Sie denkt."
 
 msgid "It would appear you have received new mails."
-msgstr "It would appear you have received new mails."
+msgstr "Es sieht so aus, als hätten Sie neue E-Mails erhalten."
 
 msgid "Mail sent by {0}"
 msgstr "Mail gesendet von {0}"
 
 msgid "The email was sent by {0}"
-msgstr "The email was sent by {0}"
+msgstr "Die E-Mail wurde gesendet von {0}"
 
 msgid "The sender of the mail is {0}"
-msgstr "The sender of the mail is {0}"
+msgstr "Der Absender der E-Mail ist {0}"
 
 msgid "The sender is {0}"
-msgstr "The sender is {0}"
+msgstr "Der Absender ist {0}"
 
 msgid "The email subject is : {0}"
 msgstr "Betreff der Email ist: {0}"
 
 msgid "The subject of the email is : {0}"
-msgstr "The subject of the email is : {0}"
+msgstr "Thema der E-Mail ist: {0}"
 
 msgid "The email topic is : {0}"
-msgstr "The email topic is : {0}"
+msgstr "Das E-Mail-Thema ist: {0}"
 
 msgid "The topic is : {0}"
-msgstr "The topic is : {0}"
+msgstr "Das Thema ist: {0}"
 
 msgid "The title of the email is : {0}"
-msgstr "The title of the email is : {0}"
+msgstr "Der Titel der E-Mail ist: {0}"
 
 msgid "No new mail."
 msgstr "Keine neue Mail."
 
 msgid "I'm sorry, nobody sent you any email."
-msgstr "I'm sorry, nobody sent you any email."
+msgstr "Es tut mir leid, niemand hat Ihnen eine E-Mail gesandt."
 
 msgid "No mails. Nobody seems to be thinking about you."
-msgstr "No mails. Nobody seems to be thinking about you."
+msgstr "Keine Mails. Anscheinend denkt niemand an Sie."
 
 msgid "Your mailbox is empty."
-msgstr "Your mailbox is empty."
+msgstr "Ihre Mailbox ist leer."
 
 msgid "your_user"
 msgstr "Ihr Benutzer"
@@ -138,13 +138,13 @@
 msgstr "Prüfen Sie meine Mailbox häufig"
 
 msgid "G-mail is busy right now. Please try again later."
-msgstr "G-mail is busy right now. Please try again later."
+msgstr "G-mail ist gerade beschäftigt. Bitte versuchen Sie es später erneut."
 
 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 "Die Google Mail-Website ist gerade ziemlich ausgelastet. Sie sollten es später wieder versuchen."
 
 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 "Ich habe Schwierigkeiten bei der Verbindung mit Google Mail. Bitte versuchen Sie es später erneut."
 
 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 "Ich habe eine Pause beim Prüfen Ihres G-mail-Kontos eingelegt. Die Google-Mail-Website ist gerade zu beschäftigt."

[tuxdroid-svn] r5782 - software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 14:32:08 +0100 (Wed, 28 Oct 2009)
New Revision: 5782

Modified:
   software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po
Log:
* Added the german translations


Modified: software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po	2009-10-28 13:31:34 UTC (rev 5781)
+++ software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po	2009-10-28 13:32:08 UTC (rev 5782)
@@ -45,55 +45,55 @@
 msgstr "Sie haben eine neue Email."
 
 msgid "A new mail has arrived !"
-msgstr "A new mail has arrived !"
+msgstr "Eine neue Mail ist eingetroffen!"
 
 msgid "It appears you have received a new email."
-msgstr "It appears you have received a new email."
+msgstr "Anscheinend haben Sie eine neue E-Mail erhalten."
 
 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 "Eine neue E-Mail? Ich frage mich, wer gerade an Sie denkt."
 
 msgid "It would appear you have received new mails."
-msgstr "It would appear you have received new mails."
+msgstr "Es sieht so aus, als hätten Sie neue E-Mails erhalten."
 
 msgid "Mail sent by {0}"
 msgstr "Mail gesendet von {0}"
 
 msgid "The email was sent by {0}"
-msgstr "The email was sent by {0}"
+msgstr "Die E-Mail wurde gesendet von {0}"
 
 msgid "The sender of the mail is {0}"
-msgstr "The sender of the mail is {0}"
+msgstr "Der Absender der E-Mail ist {0}"
 
 msgid "The sender is {0}"
-msgstr "The sender is {0}"
+msgstr "Der Absender ist {0}"
 
 msgid "The email subject is : {0}"
 msgstr "Betreff der Email ist: {0}"
 
 msgid "The subject of the email is : {0}"
-msgstr "The subject of the email is : {0}"
+msgstr "Thema der E-Mail ist: {0}"
 
 msgid "The email topic is : {0}"
-msgstr "The email topic is : {0}"
+msgstr "Das E-Mail-Thema ist: {0}"
 
 msgid "The topic is : {0}"
-msgstr "The topic is : {0}"
+msgstr "Das Thema ist: {0}"
 
 msgid "The title of the email is : {0}"
-msgstr "The title of the email is : {0}"
+msgstr "Der Titel der E-Mail ist: {0}"
 
 msgid "No new mail."
 msgstr "Keine neue Mail."
 
 msgid "I'm sorry, nobody sent you any email."
-msgstr "I'm sorry, nobody sent you any email."
+msgstr "Es tut mir leid, niemand hat Ihnen eine E-Mail gesandt."
 
 msgid "No mails. Nobody seems to be thinking about you."
-msgstr "No mails. Nobody seems to be thinking about you."
+msgstr "Keine Mails. Anscheinend denkt niemand an Sie."
 
 msgid "Your mailbox is empty."
-msgstr "Your mailbox is empty."
+msgstr "Ihre Mailbox ist leer."
 
 msgid "your_user"
 msgstr "Ihr Benutzer"

[tuxdroid-svn] r5785 - software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 14:33:32 +0100 (Wed, 28 Oct 2009)
New Revision: 5785

Modified:
   software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po
Log:
* Added german translations


Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po	2009-10-28 13:33:11 UTC (rev 5784)
+++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po	2009-10-28 13:33:32 UTC (rev 5785)
@@ -24,64 +24,64 @@
 msgstr "Das Wetter in {0} ist derzeit \"{1}\" mit einer Temperatur von {2} Grad {3}; die Luftfeuchtigkeit beträgt {4} Prozent."
 
 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} ist das Wetter {1} mit einer Temperatur von {2} Grad {3}. Die Luftfeuchtigkeit beträgt {4} Prozent."
 
 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 "Das Wetter ist zurzeit {1} in {0}, die Luftfeuchtigkeit liegt bei {4} Prozent. Die Temperatur beträgt {2} Grad {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 "Bei einer Temperatur von {2} Grad {3} könnte man das Wetter in {0} als {1} bezeichnen, die Luft ist zu {4} Prozent feucht."
 
 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 "Das aktuelle Wetter ist \"{1}\" mit einer Temperatur von {2} Grad {3}; die Luftfeuchtigkeit beträgt {4} Prozent."
 
 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 "Das Wetter ist {1}, die Temperatur beträgt {2} Grad {3}. Die Luftfeuchtigkeit beträgt {4} Prozent."
 
 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 "Das Wetter ist zurzeit {1}, die Luftfeuchte liegt bei {4} Prozent. Die Temperatur beträgt {2} Grad {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 "Bei einer Temperatur von {2} Grad {3} könnte man das Wetter wohl als {1} bezeichnen, die Luft ist zu {4} Prozent feucht."
 
 msgid "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent."
 msgstr "Das Wetter in {0} ist derzeit \"unbekannt\" bei einer Temperatur von {1} Grad {2}; die Luftfeuchtigkeit beträgt {3} Prozent."
 
 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} ist das Wetter unbekannt, die Temperatur beträgt {1} Grad {2}. Die Luftfeuchtigkeit beträgt {3} Prozent."
 
 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 "Das Wetter in {0} ist zurzeit nicht bekannt, die Luftfeuchtigkeit liegt bei {3} Prozent. Die Temperatur beträgt etwa {1} Grad {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 "Über die Temperatur von {1} Grad {2} hinaus ist das Wetter in {0} eher unbekannt, die Luftfeuchte beträgt {3} Prozent."
 
 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 "Das aktuelle Wetter ist nicht bekannt, die Temperatur beträgt {1} Grad {2}; Die Luftfeuchtigkeit liegt bei {3} Prozent."
 
 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 "Das Wetter ist unbekannt, die Temperatur beträgt {1} Grad {2}. Die Luftfeuchtigkeit beträgt {3} Prozent."
 
 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 "Das Wetter ist zurzeit nicht bekannt, die Luftfeuchtigkeit liegt bei {3} Prozent. Die Temperatur beträgt etwa {1} Grad {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 "Über die Temperatur von {1} Grad {2} hinaus ist das Wetter in {0} eher unbekannt, die Luftfeuchte beträgt {3} Prozent."
 
 msgid "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees."
 msgstr "Das Wetter für morgen. \"{0}\" Temperaturen zwischen {1} und {2} Grad."
 
 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 ist das Wetter {0} mit Temperaturen zwischen {1} und {2} Grad."
 
 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 "Bei Temperaturen zwischen {1} und {2} Grad ist die Vorschau für 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 soll das Wetter {0} werden, mit Temperaturen zwischen {1} und {2} Grad."
 
 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 "Morgen wird das Wetter {0} mit Temperaturen zwischen {1} und {2} Grad."
 
 msgid "http://www.google.com/ig/api?hl=en&weather=%s"
 msgstr "http://www.google.com/ig/api?hl=de&weather=%s"
@@ -90,13 +90,13 @@
 msgstr "Ort nicht gefunden. Prüfen Sie den Namen der Stadt oder geben Sie den einer anderen in Nähe an."
 
 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 "Der Städtename wurde nicht gefunden. Meinen Sie, diese Stadt existiere wirklich?"
 
 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 "Die angegebene Stadt ist nicht in meiner Datenbank. Prüfen Sie, ob es den Städtenamen wirklich gibt oder geben Sie einen anderen aus der Nähe an."
 
 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 "Tut mir leid, ich kann Ihnen das Wetter für den angegebenen Ort nicht nennen. Versuchen Sie einen anderen Städtenamen aus der Nähe."
 
 msgid "Start every x from full hour"
 msgstr "Hinweise"

[tuxdroid-svn] r5781 - software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources

[ks156 <c2m...@c2...>]

Author: ks156
Date: 2009-10-28 14:31:34 +0100 (Wed, 28 Oct 2009)
New Revision: 5781

Modified:
   software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po
Log:
* Added german translations


Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po	2009-10-28 12:40:53 UTC (rev 5780)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po	2009-10-28 13:31:34 UTC (rev 5781)
@@ -11,19 +11,19 @@
 msgstr "Es ist {0} Uhr und {1} Minuten."
 
 msgid "It is {0} hours {1}."
-msgstr "It is {0} hours {1}."
+msgstr "Es ist {0} Uhr {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 "Beim nächsten Beep ist es genau {0} Uhr {1} ... BIP !"
 
 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 "Beim nächsten Beep ist es genau {0} Uhr und {1} Minuten ... BEEP !"
 
 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 "Es ist {1} Uhr und {0} Minuten ... halt, Ich meine {0} Uhr und {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 "Es ist {1} Uhr {0} ... halt, Ich meine {0} Uhr {1}."
 
 msgid "It is {0} o'clock"
 msgstr "Es ist {0} Uhr"
@@ -32,31 +32,31 @@
 msgstr "Es ist genau {0} Uhr."
 
 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 "Beim nächsten Beep ist es genau {0} Uhr ... BEEP !"
 
 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 "Beim nächsten Beep ist es {0} Uhr ... BEEP !"
 
 msgid "It's midnight"
-msgstr "It's midnight"
+msgstr "Es ist Mitternacht"
 
 msgid "It's noon"
-msgstr "It's noon"
+msgstr "Es ist Mittag"
 
 msgid "It's quarter past {0}"
-msgstr "It's quarter past {0}"
+msgstr "Es ist Viertel nach {0}"
 
 msgid "It's a quarter after {0}"
-msgstr "It's a quarter after {0}"
+msgstr "Es ist Viertel nach {0}"
 
 msgid "It's quarter to {0}"
-msgstr "It's quarter to {0}"
+msgstr "Es ist Viertel vor {0}"
 
 msgid "It's a quarter until {0}"
-msgstr "It's a quarter until {0}"
+msgstr "Es ist Viertel vor {0}"
 
 msgid "It's half past {0}"
-msgstr "It's half past {0}"
+msgstr "Es ist {0} Uhr dreißig"
 
 msgid "Start every x from full hour"
 msgstr "Hinweise"

[tuxdroid-svn] r5786 - software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-10-28 14:46:12 +0100 (Wed, 28 Oct 2009)
New Revision: 5786

Modified:
   software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po
Log:
* Fixed a German sentence.

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 13:33:32 UTC (rev 5785)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/de.po	2009-10-28 13:46:12 UTC (rev 5786)
@@ -97,4 +97,4 @@
 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."
+msgstr "Anscheinend sind Sie nicht mit Facebook verbunden. Prüfen Sie Benutzername und Passwort und versuchen Sie es danach wieder."