openlp-android team mailing list archive

Thread
Date

[Merge] lp:~trb143/openlp/android_03 into lp:openlp/android

To: mp+88604@xxxxxxxxxxxxxxxxxx, Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>
From: Tim Bentley <tim.bentley@xxxxxxxxx>
Date: Sun, 15 Jan 2012 11:40:31 -0000
Reply-to: mp+88604@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Tim Bentley has proposed merging lp:~trb143/openlp/android_03 into lp:openlp/android.

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~trb143/openlp/android_03/+merge/88604

Bug fix for blanking button and translation files.
0.3 will be built from this source 
-- 
https://code.launchpad.net/~trb143/openlp/android_03/+merge/88604
Your team OpenLP Android Developers is subscribed to branch lp:openlp/android.

=== modified file 'OpenLP.apk'
Binary files OpenLP.apk	2012-01-09 17:00:31 +0000 and OpenLP.apk	2012-01-15 11:39:25 +0000 differ
=== added file 'res/values-af/strings.xml'
--- res/values-af/strings.xml	1970-01-01 00:00:00 +0000
+++ res/values-af/strings.xml	2012-01-15 11:39:25 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">OpenLP</string>
+  <string name="settings">Instellings</string>
+  <string name="preferences">Voorkeure</string>
+  <string name="exit">Uitgang</string>
+  <string name="prev">Vorige</string>
+  <string name="next">Volgende</string>
+  <string name="previousServiceItem">Vorige Item</string>
+  <string name="nextServiceItem">Volgende Item</string>
+  <string name="previousSlide">Vorige Skyfie</string>
+  <string name="nextSlide">Volgende Skyfie</string>
+  <string name="blank">Blanko</string>
+  <string name="unblank">Vertoon</string>
+  <string name="alert">Attent:</string>
+  <string name="alertHint">Vul attent boodskap in</string>
+  <string name="alertTextNull">Vul asseblief \'n boodskap in om te stuur.</string>
+  <string name="send">Stuur</string>
+  <string name="Slide">Skyfie</string>
+  <string name="slides">Skyfies</string>
+  <string name="Service">Diens</string>
+  <string name="misc">Verskeie</string>
+  <string name="preferenceCategoryTitleServer">Bediener</string>
+  <string name="url">Bediener</string>
+  <string name="urlHint">Gasheer naam of IP</string>
+  <string name="port">Poort</string>
+  <string name="enableCustomTimeouts">Bekragtig Aangepasde Tyd-uitlope</string>
+  <string name="displayType">Vertoning Blanko Tipe</string>
+  <string name="displayBlankType">Vertoning Blanko Tipe</string>
+  <string name="displayBlankSummary">Kies die gevraagde blanko tipe</string>
+  <string name="displayScreen">Skerm</string>
+  <string name="displayTheme">Tema</string>
+  <string name="displayDesktop">Hoofblad</string>
+  <string name="displayBlankOn">Herstel vertoon vorm</string>
+  <string name="displayBlankOff">Blanko skerm na</string>
+  <string name="customTimeoutsSummary">Tik om tyd-uitloop instellings te verander</string>
+  <string name="customTimeout">Aangepasde Tyd-uitlope</string>
+  <string name="socketTimeout">Sok Tyd-uitloop</string>
+  <string name="socketTimeoutSummary">Kies \'n waarde (millisekondes)</string>
+  <string name="connectionTimeout">Konneksie Tyd-uitloop</string>
+  <string name="connectionTimedout">Kenneksie tyd het uitgeloop</string>
+  <string name="connectionTimeoutSummary">Kies \'n waarde (millisekondes)</string>
+  <string name="save">Stoor</string>
+  <string name="unable">Nie in staat om blad te laai nie -</string>
+  <string name="fail">Konneksie het misluk</string>
+  <string name="jsonfail">JSON het misluk</string>
+  <string name="loading">Konnekteer...</string>
+  <string name="searching">Soek...</string>
+  <string name="loadingServiceItems">Laai Diens Items...</string>
+  <string name="loadingSlideItems">Laai Skyfie Items...</string>
+  <string name="loadingStatusInfo">Laai Status Inligting...</string>
+  <string name="searchHint">Soek OpenLP</string>
+  <string name="searchResults">Soek Resultate</string>
+  <string name="showingResults">Vertoon Resultate vir \'%s\'</string>
+</resources>

=== modified file 'res/values-de/strings.xml'
--- res/values-de/strings.xml	2012-01-01 15:01:26 +0000
+++ res/values-de/strings.xml	2012-01-15 11:39:25 +0000
@@ -1,55 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">OpenLP</string>
-  <string name="settings"></string>
-  <string name="preferences"></string>
-  <string name="exit"></string>
-  <string name="prev"></string>
-  <string name="next"></string>
-  <string name="previousServiceItem"></string>
-  <string name="nextServiceItem"></string>
-  <string name="previousSlide"></string>
-  <string name="nextSlide"></string>
-  <string name="blank"></string>
-  <string name="unblank"></string>
+  <string name="settings">Einstellungen</string>
+  <string name="preferences">Voreinstellungen</string>
+  <string name="exit">Beenden</string>
+  <string name="prev">Zurück</string>
+  <string name="next">Vorwärts</string>
+  <string name="previousServiceItem">Vorheriges Element</string>
+  <string name="nextServiceItem">Nächstes Element</string>
+  <string name="previousSlide">Vorherige Folie</string>
+  <string name="nextSlide">Nächste Folie</string>
+  <string name="blank">Abdunkeln</string>
+  <string name="unblank">Aufhellen</string>
   <string name="alert">Hinweis:</string>
-  <string name="alertHint"></string>
-  <string name="alertTextNull"></string>
-  <string name="send"></string>
+  <string name="alertHint">Alarm eingeben</string>
+  <string name="alertTextNull">Bitte geben Sie eine Nachricht ein, welche gesendet werden soll.</string>
+  <string name="send">Senden</string>
   <string name="Slide">Folie</string>
   <string name="slides">Folien</string>
   <string name="Service">Ablauf</string>
-  <string name="misc"></string>
+  <string name="misc">Verschiedenes</string>
   <string name="preferenceCategoryTitleServer">Server</string>
   <string name="url">Server</string>
   <string name="urlHint">Hostname oder IP</string>
   <string name="port">Port</string>
-  <string name="enableCustomTimeouts"></string>
-  <string name="displayType"></string>
-  <string name="displayBlankType"></string>
-  <string name="displayBlankSummary"></string>
-  <string name="displayScreen"></string>
+  <string name="enableCustomTimeouts">Aktiviere eigene Time-outs</string>
+  <string name="displayType">Zeige Verdunklungstyp an</string>
+  <string name="displayBlankType">Zeige Verdunklungstyp an</string>
+  <string name="displayBlankSummary">Wähle den erforderlichen Verdunklungstyp</string>
+  <string name="displayScreen">Bildschirm</string>
   <string name="displayTheme">Design</string>
-  <string name="displayDesktop"></string>
-  <string name="displayBlankOn"></string>
-  <string name="displayBlankOff"></string>
-  <string name="customTimeoutsSummary"></string>
-  <string name="customTimeout"></string>
-  <string name="socketTimeout"></string>
-  <string name="socketTimeoutSummary"></string>
-  <string name="connectionTimeout"></string>
-  <string name="connectionTimedout"></string>
-  <string name="connectionTimeoutSummary"></string>
+  <string name="displayDesktop">Arbeitsfläche</string>
+  <string name="socketTimeoutSummary">Wähle einen Wert (in Millisekunden)</string>
+  <string name="connectionTimeout">Verbindungzeit überschritten</string>
+  <string name="connectionTimedout">Verbindungszeit abgelaufen</string>
+  <string name="connectionTimeoutSummary">Wähle einen Wert (in Millisekunden)</string>
   <string name="save">Speichern</string>
-  <string name="unable"></string>
-  <string name="fail"></string>
-  <string name="jsonfail"></string>
+  <string name="unable">Seite kann nicht geladen werden -</string>
+  <string name="fail">Verbindung fehlgeschlagen</string>
+  <string name="jsonfail">JSON fehlgeschlagen</string>
   <string name="loading">Verbinde...</string>
   <string name="searching">Suche...</string>
-  <string name="loadingServiceItems"></string>
-  <string name="loadingSlideItems"></string>
-  <string name="loadingStatusInfo"></string>
-  <string name="searchHint"></string>
-  <string name="searchResults"></string>
-  <string name="showingResults"></string>
+  <string name="loadingServiceItems">Lade Ablauf Elemente...</string>
+  <string name="loadingSlideItems">Lade Folien Elemente...</string>
+  <string name="loadingStatusInfo">Lade Status Info...</string>
+  <string name="searchHint">Suche OpenLP</string>
+  <string name="searchResults">Such Ergebnisse</string>
+  <string name="showingResults">Zeige Ergebnisse für \'%s\'</string>
 </resources>

=== added directory 'res/values-el'
=== added file 'res/values-el/strings.xml'
--- res/values-el/strings.xml	1970-01-01 00:00:00 +0000
+++ res/values-el/strings.xml	2012-01-15 11:39:25 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">OpenLP</string>
+  <string name="settings">Ρυθμίσεις</string>
+  <string name="preferences">Προτιμήσεις</string>
+  <string name="exit">Έξοδος</string>
+  <string name="prev">Προηγούμενο</string>
+  <string name="next">Επόμενο</string>
+  <string name="previousServiceItem">Προηγούμενο Αντικείμενο</string>
+  <string name="nextServiceItem">Επόμενο Αντικείμενο</string>
+  <string name="previousSlide">Προηγούμενη Διαφάνεια</string>
+  <string name="nextSlide">Επόμενη Διαφάνεια</string>
+  <string name="blank">Κενό</string>
+  <string name="unblank">Μη Κενό</string>
+  <string name="alert">Ειδοποίηση:</string>
+  <string name="alertHint">Εισαγωγή μηνύματος ειδοποίησης</string>
+  <string name="alertTextNull">Παρακαλούμε εισάγετε ένα μήνυμα προς αποστολή.</string>
+  <string name="send">Αποστολή</string>
+  <string name="Slide">Διαφάνεια</string>
+  <string name="slides">Διαφάνειες</string>
+  <string name="Service">Λειτουργία</string>
+  <string name="misc">Διάφορα</string>
+  <string name="preferenceCategoryTitleServer">Server</string>
+  <string name="url">Server</string>
+  <string name="urlHint">Hostname ή διεύθυνση IP</string>
+  <string name="port">Θύρα</string>
+  <string name="enableCustomTimeouts">Ενεργοποίηση </string>
+  <string name="displayType">Εμφάνιση Τύπου Κενής Σελίδας</string>
+  <string name="displayBlankType">Εμφάνιση Τύπου Κενής Σελίδας</string>
+  <string name="displayBlankSummary">Επιλέξτε τον απαιτούμενο τύπο κενής σελίδας </string>
+  <string name="displayScreen">Οθόνη</string>
+  <string name="displayTheme">Θέμα</string>
+  <string name="displayDesktop">Επιφάνεια Εργασίας</string>
+  <string name="displayBlankOn">Επαναφορά εμφάνισης από</string>
+  <string name="displayBlankOff">Εμφάνιση Κενής Σελίδας στο</string>
+  <string name="customTimeoutsSummary">Επιλέξτε για τροποποίηση των ρυθμίσεων λήξης</string>
+  <string name="customTimeout">Τροποποιημένη Λήξη</string>
+  <string name="socketTimeout">Λήξη Socket</string>
+  <string name="socketTimeoutSummary">Επιλέξτε μια τιμή (milliseconds)</string>
+  <string name="connectionTimeout">Λήξη Σύνδεσης</string>
+  <string name="connectionTimedout">Η σύνδεση έληξε</string>
+  <string name="connectionTimeoutSummary">Επιλέξτε μια τιμή (milliseconds)</string>
+  <string name="save">Αποθήκευση</string>
+  <string name="unable">Μη δυνατή φόρτωση σελίδας -</string>
+  <string name="fail">Η σύνδεση απέτυχε</string>
+  <string name="jsonfail">JSON απέτυχε</string>
+  <string name="loading">Σύνδεση...</string>
+  <string name="searching">Αναζήτηση...</string>
+  <string name="loadingServiceItems">Φόρτωση Αντικειμένων Λειτουργίας...</string>
+  <string name="loadingSlideItems">Φόρτωση Αντικειμένων Διαφανειών...</string>
+  <string name="loadingStatusInfo">Φόρτωση Πληροφοριών Κατάστασης...</string>
+  <string name="searchHint">Αναζήτηση OpenLP</string>
+  <string name="searchResults">Αποτελέσματα Αναζήτησης</string>
+  <string name="showingResults">Εμφάνιση Αποτελεσμάτων για \'%s\'</string>
+</resources>

=== added directory 'res/values-en-rGB'
=== added file 'res/values-en-rGB/strings.xml'
--- res/values-en-rGB/strings.xml	1970-01-01 00:00:00 +0000
+++ res/values-en-rGB/strings.xml	2012-01-15 11:39:25 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">OpenLP</string>
+  <string name="settings">Settings</string>
+  <string name="preferences">Preferences</string>
+  <string name="exit">Exit</string>
+  <string name="prev">Previous</string>
+  <string name="next">Next</string>
+  <string name="previousServiceItem">Previous Item</string>
+  <string name="nextServiceItem">Next Item</string>
+  <string name="previousSlide">Previous Slide</string>
+  <string name="nextSlide">Next Slide</string>
+  <string name="blank">Blank</string>
+  <string name="unblank">Unblank</string>
+  <string name="alert">Alert:</string>
+  <string name="alertHint">Enter alert message</string>
+  <string name="alertTextNull">Please enter a message to send.</string>
+  <string name="send">Send</string>
+  <string name="Slide">Slide</string>
+  <string name="slides">Slides</string>
+  <string name="Service">Service</string>
+  <string name="misc">Miscellaneous</string>
+  <string name="preferenceCategoryTitleServer">Server</string>
+  <string name="url">Server</string>
+  <string name="urlHint">Hostname or IP</string>
+  <string name="port">Port</string>
+  <string name="enableCustomTimeouts">Enable Custom Timeouts</string>
+  <string name="displayType">Display Blank Type</string>
+  <string name="displayBlankType">Display Blank Type</string>
+  <string name="displayBlankSummary">Select the required blank type</string>
+  <string name="displayScreen">Screen</string>
+  <string name="displayTheme">Theme</string>
+  <string name="displayDesktop">Desktop</string>
+  <string name="displayBlankOn">Reset display from</string>
+  <string name="displayBlankOff">Blank display to</string>
+  <string name="customTimeoutsSummary">Check to modify timeout settings</string>
+  <string name="customTimeout">Custom Timeout</string>
+  <string name="socketTimeout">Socket Timeout</string>
+  <string name="socketTimeoutSummary">Select a value (milliseconds)</string>
+  <string name="connectionTimeout">Connection Timeout</string>
+  <string name="connectionTimedout">Connection timed out</string>
+  <string name="connectionTimeoutSummary">Select a value (milliseconds)</string>
+  <string name="save">Save</string>
+  <string name="unable">Unable to load page -</string>
+  <string name="fail">Connection failed</string>
+  <string name="jsonfail">JSON failed</string>
+  <string name="loading">Connecting...</string>
+  <string name="searching">Searching...</string>
+  <string name="loadingServiceItems">Loading Service Items...</string>
+  <string name="loadingSlideItems">Loading Slide Items...</string>
+  <string name="loadingStatusInfo">Loading Status Info...</string>
+  <string name="searchHint">Search OpenLP</string>
+  <string name="searchResults">Search Results</string>
+  <string name="showingResults">Showing Results for \'%s\'</string>
+</resources>

=== added file 'res/values-fr/strings.xml'
--- res/values-fr/strings.xml	1970-01-01 00:00:00 +0000
+++ res/values-fr/strings.xml	2012-01-15 11:39:25 +0000
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">OpenLP</string>
+  <string name="settings">Paramètres</string>
+  <string name="preferences">Préférences</string>
+  <string name="exit">Quitter</string>
+  <string name="prev">Précédent</string>
+  <string name="next">Suivant</string>
+  <string name="previousServiceItem">Élément précédent</string>
+  <string name="nextServiceItem">Élément suivant</string>
+  <string name="previousSlide">Diapo précédente</string>
+  <string name="nextSlide">Diapo suivante</string>
+  <string name="blank">Vide</string>
+  <string name="unblank">Restaure</string>
+  <string name="alert">Alerte :</string>
+  <string name="alertHint">Entrez le message d\'alerte</string>
+  <string name="alertTextNull">Veuillez entrer un message à envoyer.</string>
+  <string name="send">Envoyer</string>
+  <string name="Slide">Diapositive</string>
+  <string name="slides">Diapositives</string>
+  <string name="Service">Service</string>
+  <string name="misc">Divers</string>
+  <string name="preferenceCategoryTitleServer">Serveur</string>
+  <string name="url">Serveur</string>
+  <string name="urlHint">Nom d\'hôte ou IP</string>
+  <string name="port">Port</string>
+  <string name="enableCustomTimeouts">Activer le délai personnalisé</string>
+  <string name="displayType">Afficher un type vide</string>
+  <string name="displayBlankType">Afficher un type vide</string>
+  <string name="displayBlankSummary">Sélectionnez le type vide requis</string>
+  <string name="displayScreen">Écran</string>
+  <string name="displayTheme">Thème</string>
+  <string name="displayDesktop">Bureau</string>
+  <string name="displayBlankOn">Restaure l\'affichage à partir de</string>
+  <string name="displayBlankOff">Affichage vide vers</string>
+  <string name="customTimeoutsSummary">Vérifiez le paramétrage du délai</string>
+  <string name="customTimeout">Délai personnalisé</string>
+  <string name="socketTimeout">Délai de connexion réseau</string>
+  <string name="socketTimeoutSummary">Sélectionnez une valeur (millisecondes)</string>
+  <string name="connectionTimeout">Délai de connexion</string>
+  <string name="connectionTimedout">Connexion expirée</string>
+  <string name="connectionTimeoutSummary">Sélectionnez une valeur (millisecondes)</string>
+  <string name="save">Enregistrer</string>
+  <string name="unable">Impossible de charger la page -</string>
+  <string name="fail">Échec de connexion</string>
+  <string name="jsonfail">Erreur JSON</string>
+  <string name="loading">Connexion en cours...</string>
+  <string name="searching">Recherche en cours...</string>
+  <string name="loadingServiceItems">Chargement des éléments du service...</string>
+  <string name="loadingSlideItems">Chargement des diapositives...</string>
+  <string name="loadingStatusInfo">Chargement des infos d\'état...</string>
+  <string name="searchHint">Recherche OpenLP</string>
+  <string name="searchResults">Résultats de recherche</string>
+  <string name="showingResults">Affichage des résultats de \'%s\'</string>
+</resources>

=== added file 'res/values-ja/strings.xml'
--- res/values-ja/strings.xml	1970-01-01 00:00:00 +0000
+++ res/values-ja/strings.xml	2012-01-15 11:39:25 +0000
@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">OpenLP</string>
+  <string name="settings">設定</string>
+  <string name="preferences">設定</string>
+  <string name="exit">終了</string>
+  <string name="prev">前</string>
+  <string name="next">次</string>
+  <string name="previousServiceItem">前の項目</string>
+  <string name="nextServiceItem">次の項目</string>
+  <string name="previousSlide">前のスライド</string>
+  <string name="nextSlide">次のスライド</string>
+  <string name="blank">ブランク</string>
+  <string name="unblank">ブランクを戻す</string>
+  <string name="alert">警告:</string>
+  <string name="alertHint">警告文を入力</string>
+  <string name="alertTextNull">警告するメッセージを入力してください。</string>
+  <string name="send">送る</string>
+  <string name="Slide">スライド</string>
+  <string name="slides">スライド</string>
+  <string name="Service">礼拝</string>
+  <string name="misc">その他</string>
+  <string name="preferenceCategoryTitleServer">サーバ</string>
+  <string name="url">サーバ</string>
+  <string name="urlHint">ホスト名またはIPアドレス</string>
+  <string name="port">ポート</string>
+  <string name="enableCustomTimeouts">任意のタイムアウトを有効にする</string>
+  <string name="displayType">ブランクの種類</string>
+  <string name="displayBlankType">ブランクの種類</string>
+  <string name="displayBlankSummary">ブランクの種類を選択してください</string>
+  <string name="displayScreen">スクリーン</string>
+  <string name="displayTheme">テーマ</string>
+  <string name="displayDesktop">デスクトップ</string>
+  <string name="customTimeout">カスタムタイムアウト</string>
+  <string name="socketTimeout">ソケットタイムアウト</string>
+  <string name="socketTimeoutSummary">値を選択 (ミリ秒)</string>
+  <string name="connectionTimeout">接続タイムアウト</string>
+  <string name="connectionTimedout">接続がタイムアウトしました</string>
+  <string name="connectionTimeoutSummary">値を選択 (ミリ秒)</string>
+  <string name="save">保存</string>
+  <string name="fail">接続に失敗しました</string>
+  <string name="jsonfail">JSONに失敗しました</string>
+  <string name="loading">接続中...</string>
+  <string name="searching">検索中...</string>
+  <string name="loadingServiceItems">礼拝項目を読込中...</string>
+  <string name="loadingSlideItems">スライド項目を読込中...</string>
+  <string name="loadingStatusInfo">ステータス情報を読込中...</string>
+  <string name="searchHint">OpenLPを検索</string>
+  <string name="searchResults">検索結果</string>
+  <string name="showingResults">\'%s\'の結果を表示中</string>
+</resources>

=== modified file 'src/org/openlp/android/activity/Misc.java'
--- src/org/openlp/android/activity/Misc.java	2012-01-09 16:55:23 +0000
+++ src/org/openlp/android/activity/Misc.java	2012-01-15 11:39:25 +0000
@@ -55,7 +55,6 @@
     Misc misc = this;
     SharedPreferences prefs;
     String displayType;
-    
     /*
      * Process the Alert button 
      */
@@ -120,6 +119,12 @@
                     Toast.makeText(context, String.format("%s: %s", e.getClass().getSimpleName(), e.getMessage()),
                             Toast.LENGTH_SHORT).show();
                 }
+				try {
+					Thread.sleep(500);
+				}
+				catch (InterruptedException e) {
+					e.printStackTrace();
+				}                
                 PollStatusTask poll = new PollStatusTask(misc);
                 poll.execute(POLL_STATUS);
             }
@@ -240,15 +245,15 @@
 				 */
 				if (poll.isDisplayHidden()) {
 					if (poll.isBlankedDisplayed()) {
-						Log.d(LOG_TAG, "Blank called");
+						Log.d(LOG_TAG, "Hidden Blank called");
 						onText = context.getString(R.string.displayScreen);
 					}
 					else if (poll.isThemeDisplayed()) {
-						Log.d(LOG_TAG, "Theme called");
+						Log.d(LOG_TAG, "Hidden Theme called");
 						onText = context.getString(R.string.displayTheme);
 					}
 					else {
-						Log.d(LOG_TAG, "Desktop called");
+						Log.d(LOG_TAG, "Hidden Desktop called");
 						onText = context.getString(R.string.displayDesktop);
 					}
 				}

Follow ups

[Merge] lp:~trb143/openlp/android_03 into lp:openlp/android
From: noreply, 2012-01-15
Re: [Merge] lp:~trb143/openlp/android_03 into lp:openlp/android
From: Raoul Snyman, 2012-01-15
Re: [Merge] lp:~trb143/openlp/android_03 into lp:openlp/android
From: Raoul Snyman, 2012-01-15