[tuxdroid-svn] r5684 - in software_suite_v3/software/plugin/plugin-clock/branches/random_sentences:
Status: Beta
Brought to you by:
ks156
|
From: ks156 <c2m...@c2...> - 2009-10-15 13:11:01
|
Author: ks156
Date: 2009-10-15 15:10:46 +0200 (Thu, 15 Oct 2009)
New Revision: 5684
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/en.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Added more sentences
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-15 13:10:16 UTC (rev 5683)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po 2009-10-15 13:10:46 UTC (rev 5684)
@@ -7,21 +7,36 @@
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 "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 "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+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 "Current time is {0} o'clock"
-msgstr "Jetzt ist es {0} Uhr."
+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 "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 "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"
@@ -31,9 +46,15 @@
msgid "It's quarter past {0}"
msgstr "It's quarter past {0}"
-msgid "It's a quarter to {0}"
+msgid "It's a quarter after {0}"
+msgstr "It's a quarter after {0}"
+
+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 half past {0}"
msgstr "It's half past {0}"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-15 13:10:16 UTC (rev 5683)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-15 13:10:46 UTC (rev 5684)
@@ -7,21 +7,36 @@
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 "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 "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+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 "Current time is {0} o'clock"
-msgstr "Current time is {0} o'clock"
+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"
@@ -31,9 +46,15 @@
msgid "It's quarter past {0}"
msgstr "It's quarter past {0}"
-msgid "It's a quarter to {0}"
+msgid "It's a quarter after {0}"
+msgstr "It's a quarter after {0}"
+
+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 half past {0}"
msgstr "It's half past {0}"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-15 13:10:16 UTC (rev 5683)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-15 13:10:46 UTC (rev 5684)
@@ -7,21 +7,36 @@
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 "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 "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+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 "Current time is {0} o'clock"
-msgstr "Il est {0} heures."
+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 procain top, il sera exactement {0} heures ... TOP !"
+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"
@@ -31,9 +46,15 @@
msgid "It's quarter past {0}"
msgstr "Il est {0} heures et quart"
-msgid "It's a quarter to {0}"
+msgid "It's a quarter after {0}"
+msgstr "Il est {0} heures et un 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 half past {0}"
msgstr "Il est {0} heures et demi"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-15 13:10:16 UTC (rev 5683)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-15 13:10:46 UTC (rev 5684)
@@ -10,18 +10,33 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Het is nu {0} uur en {1} minuten."
+msgid "It is {0} hours {1}."
+msgstr "It is {0} hours {1}."
+
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 "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+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 "Current time is {0} o'clock"
+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 "Het is nu {0} uur."
msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
msgstr "At the next beep it will be exactly {0} o'clock ... BEEP !"
+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"
@@ -31,9 +46,15 @@
msgid "It's quarter past {0}"
msgstr "It's quarter past {0}"
-msgid "It's a quarter to {0}"
+msgid "It's a quarter after {0}"
+msgstr "It's a quarter after {0}"
+
+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 half past {0}"
msgstr "It's half past {0}"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-15 13:10:16 UTC (rev 5683)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-15 13:10:46 UTC (rev 5684)
@@ -7,21 +7,36 @@
msgid "This plugin gives you the time."
msgstr ""
-msgid "Current time is {0} hours and {1} minutes."
+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 "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+msgid "At the next beep it will be {0} hours and {1} minutes ... BEEP !"
msgstr ""
-msgid "Current time is {0} o'clock"
+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 ""
@@ -31,9 +46,15 @@
msgid "It's quarter past {0}"
msgstr ""
-msgid "It's a quarter to {0}"
+msgid "It's a quarter after {0}"
msgstr ""
+msgid "It's quarter to {0}"
+msgstr ""
+
+msgid "It's a quarter until {0}"
+msgstr ""
+
msgid "It's half past {0}"
msgstr ""
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-15 13:10:16 UTC (rev 5683)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-15 13:10:46 UTC (rev 5684)
@@ -42,13 +42,18 @@
*/
String[] normalSentences = {
- "Current time is {0} hours and {1} minutes.",
+ "It is {0} hours and {1} minutes.",
+ "It is {0} hours {1}.",
"At the next beep it will be exactly {0} hours {1} ... BEEP !",
- "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+ "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 = {
- "Current time is {0} o'clock",
+ "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 !"
};
public static void main(String[] args) throws Exception {
@@ -91,23 +96,18 @@
throwMessage("It's quarter past {0}", h);
}
else {
- throwMessage(this.pickSentence(normalSentences), h, m);
+ throwMessage("It's a quarter after {0}", h);
}
}
else if (m == 30) {
- if (random) {
- throwMessage("It's half past {0}", h);
- }
- else {
- throwMessage(this.pickSentence(normalSentences), h, m);
- }
+ throwMessage("It's half past {0}", h);
}
else if (m == 45) {
if (random) {
- throwMessage("It's a quarter to {0}", (h + 1));
+ throwMessage("It's quarter to {0}", (h + 1));
}
else {
- throwMessage(this.pickSentence(normalSentences), h, m);
+ throwMessage("It's a quarter until {0}", (h + 1));
}
}
else {
|