[tuxdroid-svn] r5790 - in software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather: r
Status: Beta
Brought to you by:
ks156
From: ks156 <c2m...@c2...> - 2009-10-29 06:33:56
|
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 + ; + } } |