with new translations and after findBugs

sFreezer · May 21, 2011 · fb9ab1e · fb9ab1e
1 parent 9bac79e
commit fb9ab1e
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 40 deletions.
diff --git a/MeditationTracker/gen/com/meditationtracker/R.java b/MeditationTracker/gen/com/meditationtracker/R.java
@@ -159,6 +159,9 @@ public static final class string {
         public static final int confirmDeletionMsg=0x7f050038;
         public static final int confirmDeletionTitle=0x7f050039;
         public static final int countDown=0x7f050016;
+        /**  ß can be replaced by ss
+ ß can be replaced by ss
+         */
         public static final int customMalaSize=0x7f05001c;
         public static final int dailyRepetitions=0x7f050032;
         public static final int delete=0x7f05000e;
@@ -204,7 +207,7 @@ public static final class string {
         public static final int schedule=0x7f05002c;
         public static final int scheduled=0x7f05003a;
         public static final int scheduledCompletionDate=0x7f050031;
-        /**  string name="edit">Редактировать</string
+        /**  string name="edit">Редактировать</string 
          */
         public static final int scheduledForToday=0x7f05002e;
         public static final int sessionEndNotification=0x7f050003;
@@ -222,6 +225,7 @@ public static final class string {
         public static final int tapImgToChoose=0x7f050029;
         /**  string name="clockType">Session clock</string 
   string name="clockType">Session clock</string 
+  string name="clockType">Session clock</string 
  string name="clockType">Session clock</string 
          */
         public static final int timerNotification=0x7f050019;

diff --git a/MeditationTracker/gen/doo/jpa/R.java b/MeditationTracker/gen/doo/jpa/R.java
@@ -159,6 +159,9 @@ public static final class string {
         public static final int confirmDeletionMsg=0x7f050038;
         public static final int confirmDeletionTitle=0x7f050039;
         public static final int countDown=0x7f050016;
+        /**  ß can be replaced by ss
+ ß can be replaced by ss
+         */
         public static final int customMalaSize=0x7f05001c;
         public static final int dailyRepetitions=0x7f050032;
         public static final int delete=0x7f05000e;
@@ -204,7 +207,7 @@ public static final class string {
         public static final int schedule=0x7f05002c;
         public static final int scheduled=0x7f05003a;
         public static final int scheduledCompletionDate=0x7f050031;
-        /**  string name="edit">Редактировать</string
+        /**  string name="edit">Редактировать</string 
          */
         public static final int scheduledForToday=0x7f05002e;
         public static final int sessionEndNotification=0x7f050003;
@@ -222,6 +225,7 @@ public static final class string {
         public static final int tapImgToChoose=0x7f050029;
         /**  string name="clockType">Session clock</string 
   string name="clockType">Session clock</string 
+  string name="clockType">Session clock</string 
  string name="clockType">Session clock</string 
          */
         public static final int timerNotification=0x7f050019;

diff --git a/MeditationTracker/gen/doo/util/root/R.java b/MeditationTracker/gen/doo/util/root/R.java
@@ -159,6 +159,9 @@ public static final class string {
         public static final int confirmDeletionMsg=0x7f050038;
         public static final int confirmDeletionTitle=0x7f050039;
         public static final int countDown=0x7f050016;
+        /**  ß can be replaced by ss
+ ß can be replaced by ss
+         */
         public static final int customMalaSize=0x7f05001c;
         public static final int dailyRepetitions=0x7f050032;
         public static final int delete=0x7f05000e;
@@ -204,7 +207,7 @@ public static final class string {
         public static final int schedule=0x7f05002c;
         public static final int scheduled=0x7f05003a;
         public static final int scheduledCompletionDate=0x7f050031;
-        /**  string name="edit">Редактировать</string
+        /**  string name="edit">Редактировать</string 
          */
         public static final int scheduledForToday=0x7f05002e;
         public static final int sessionEndNotification=0x7f050003;
@@ -222,6 +225,7 @@ public static final class string {
         public static final int tapImgToChoose=0x7f050029;
         /**  string name="clockType">Session clock</string 
   string name="clockType">Session clock</string 
+  string name="clockType">Session clock</string 
  string name="clockType">Session clock</string 
          */
         public static final int timerNotification=0x7f050019;

diff --git a/MeditationTracker/res/values-de/strings.xml b/MeditationTracker/res/values-de/strings.xml
@@ -2,56 +2,56 @@
 <resources>
 	<string name="delete">Löschen</string>
 	<string name="open">Öffnen</string>
-	<string name="takePicture">Fotografieren</string>
-	<string name="browseImage">Bild wählen</string>
+	<string name="takePicture">Foto machen</string>
+	<string name="browseImage">Bild auswählen</string>
 	<string name="ringtone">Klingelton</string>
 	<string name="buzz">Vibrieren</string>
 	<string name="newPractice">Meditation hinzufügen</string>
 	<string name="countDown">Countdown</string>
 	<string name="stopWatch">Stopuhr</string>
-	<string name="useStopWatch">Stopuhr oder countdown?</string>
+	<string name="useStopWatch">Stopuhr oder Countdown?</string>
 	<!--  string name="clockType">Session clock</string -->
-	<string name="timerNotification">Ton</string>
-	<string name="sessionLength">Session länge min.</string>
-	<string name="malaSize">Mala grösse</string>
-	<string name="customMalaSize">Mala grösse (leer für standarte)</string>
-	<string name="showNgondro">Ngondro zeigen</string>
+	<string name="timerNotification">Ton abspielen</string>
+	<string name="sessionLength">Sitzungslänge (min.)</string>
+	<string name="malaSize">Malagröße</string><!-- ß can be replaced by ss-->
+	<string name="customMalaSize">Malagröße (leer für Standard)</string>
+	<string name="showNgondro">Ngöndro anzeigen</string>
 
 	<string name="settings">Einstellungen</string>
 
-	<string name="app_name">Meditation Tracker</string>
-	<string name="ngondroTitle">Ngondro</string>
+	<string name="app_name">Meditations-Tracker</string>
+	<string name="ngondroTitle">Ngöndro</string>
 	<string name="myMeditationsTitle">Meine Meditationen</string>
 	<string name="guruYoga">Guru Yoga</string>
-	<string name="refuge">Zuflücht</string>
-	<string name="diamondMind">Diamond Geist</string>
-	<string name="mandalaOffering">#Mandala Offering</string>
-	<string name="practiceName">Übungs Name</string>
+	<string name="refuge">Zuflucht</string>
+	<string name="diamondMind">Diamantgeist</string>
+	<string name="mandalaOffering">Mandala Gaben</string>
+	<string name="practiceName">Name der Meditation</string>
 	<string name="requiredRepetitions">Benötigte Menge</string>
 	<string name="completedRepetitions">Abgeschlossene Menge</string>
 	<string name="save">Speichern</string>
-	<string name="tapImgToChoose">Bild tippen für ändern</string>
-	<string name="imageSourceTitle">Bild Quelle</string>
+	<string name="tapImgToChoose">Bild antippen zum Auswählen</string>
+	<string name="imageSourceTitle">Bildquelle auswählen</string>
 	<string name="start">Starten</string>
 	<string name="schedule">Zeitplan</string>
-	<string name="edit">Editiern</string>
-	<string name="scheduledForToday">Geplannt für heute</string>
+	<string name="edit">Editieren</string>
+	<string name="scheduledForToday">Geplant für heute</string>
 	<string name="completedToday">Heute gemacht</string>
-	<string name="lastPracticeDate">Tag letztes Übung</string>
-	<string name="scheduledCompletionDate">Erwartete Abschlussdatum</string>
-	<string name="dailyRepetitions">Tägliche repetitionen</string>
+	<string name="lastPracticeDate">Tag der letzten Übung</string>
+	<string name="scheduledCompletionDate">Erwartetes Abschlussdatum</string>
+	<string name="dailyRepetitions">Tägliche Wiederholungen</string>
 	<string name="completionDate">Abschlussdatum</string>
-	<string name="chooseAction">Aktion wählen</string>
-	<string name="msgNoEditNgondro">Sie könenn den Ngondro nicht löschen. Wenn nicht gebraucht - kann man es im einstellungen ausschalten.</string>
+	<string name="chooseAction">Aktion auswählen</string>
+	<string name="msgNoEditNgondro">Sie könenn das Ngöndro nicht löschen. Falls nicht gebraucht, kann es unter Einstellungen ausgeblendet werden.</string>
 	<string name="error">Fehler</string>
 	<string name="info">Information</string>
-	<string name="confirmDeletionMsg">Möchten Sie wirklich dieses Übung löschen?</string>
+	<string name="confirmDeletionMsg">Möchten Sie wirklich diese Übung löschen?</string>
 	<string name="confirmDeletionTitle">Bestätigen</string>
-	<string name="scheduled">Geplannt:</string>
-    <string name="completed">, fertig:</string>
+	<string name="scheduled">Geplant:</string>
+    <string name="completed">, Fertig:</string>
 	<string name="howMuch">Wie viel zugeben?</string>
 	<string name="stopTimer">Uhr stoppen</string>
     <string name="startTimer">Uhr starten</string>
-	<string name="addMala">Mala zugeben</string>
-	<string name="setMalaCount">Neues Zahl</string>
+	<string name="addMala">Mala hinzugeben</string>
+	<string name="setMalaCount">Neue Malagröße</string>
 </resources>
diff --git a/MeditationTracker/res/values-es/strings.xml b/MeditationTracker/res/values-es/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<resources>
+	<string name="delete">Borrar</string>
+	<string name="open">Abrir</string>
+	<string name="takePicture">Tomar photo</string>
+	<string name="browseImage">Elegir imagen</string>
+	<string name="ringtone">Sonido</string>
+	<string name="buzz">Vibrar</string>
+	<string name="newPractice">Agregar meditación</string>
+	<string name="countDown">Cuenta atrás</string>
+	<string name="stopWatch">Cronómetro</string>
+	<string name="useStopWatch">¿Cronómetro o Cuenta atrás?</string>
+	<!--  string name="clockType">Session clock</string -->
+	<string name="timerNotification">Ton abspielen</string>
+	<string name="sessionLength">Largura de la sesión (min.)</string>
+	<string name="malaSize">Tamaño de Mala</string><!-- ß can be replaced by ss-->
+	<string name="customMalaSize">Tamaño de Mala (nada para estándar)</string>
+	<string name="showNgondro">Muestrar Ngondro</string>
+
+	<string name="settings">Configuración</string>
+
+	<string name="app_name">Rastreador de Meditación</string>
+	<string name="ngondroTitle">Ngondro</string>
+	<string name="myMeditationsTitle">Mis Meditaciónes</string>
+	<string name="guruYoga">Guru Yoga</string>
+	<string name="refuge">Prostraciones</string>
+	<string name="diamondMind">Mente del Diamante</string>
+	<string name="mandalaOffering">Ofrecimiento de Mandala</string>
+	<string name="practiceName">Nombre de la Meditación</string>
+	<string name="requiredRepetitions">Cuantía necesario</string>
+	<string name="completedRepetitions">Cuantía terminada</string>
+	<string name="save">Guardar</string>
+	<string name="tapImgToChoose">Pulsar para elegir imagen</string>
+	<string name="imageSourceTitle">Elegir fuente de imagen</string>
+	<string name="start">Empezar</string>
+	<string name="schedule">Horario</string>
+	<string name="edit">Editar</string>
+	<string name="scheduledForToday">Proyectada para hoy</string>
+	<string name="completedToday">Hoy realizada</string>
+	<string name="lastPracticeDate">Dia de la última practica</string>
+	<string name="scheduledCompletionDate">Fecha de remate proyectada</string>
+	<string name="dailyRepetitions">Repeticiónes diarias</string>
+	<string name="completionDate">Fecha de remate</string>
+	<string name="chooseAction">Elegir acción</string>
+	<string name="msgNoEditNgondro">No se puede borrar el ngondro. Si no lo usas, puedes dehabilitarlo en la configuración.</string>
+	<string name="error">Error</string>
+	<string name="info">Información</string>
+	<string name="confirmDeletionMsg">¿Realmente quieres borrar esa practica?</string>
+	<string name="confirmDeletionTitle">Confirmar</string>
+	<string name="scheduled">Proyectado:</string>
+    <string name="completed">, Completado:</string>
+	<string name="howMuch">¿Cuanto adjuntar?</string>
+	<string name="stopTimer">parar el reloj</string>
+    <string name="startTimer">iniciar el reloj</string>
+	<string name="addMala">Adjuntar una Mala</string>
+	<string name="setMalaCount">Nuevo tamaño de mala</string>
+</resources>
diff --git a/MeditationTracker/res/values-ru/strings.xml b/MeditationTracker/res/values-ru/strings.xml
@@ -14,7 +14,8 @@
 	<string name="timerNotification">Мелодия</string>
 	<string name="sessionLength">Длинна сессии (мин).</string>
 	<string name="malaSize">Размер чёток</string>
-	<string name="customMalaSize">Размер чёток (оставьте пустым для стандартного)</string>
+	<string name="customMalaSize">Размер чёток (оставьте пустым для стандартного)
+	</string>
 	<string name="showNgondro">Показывать нёндро</string>
 
 	<string name="settings">Настройки</string>
@@ -34,24 +35,47 @@
 	<string name="imageSourceTitle">Источник изображения</string>
 	<string name="start">Начать практику</string>
 	<string name="schedule">Расписание</string>
-	<!-- string name="edit">Редактировать</string-->
+	<!-- string name="edit">Редактировать</string -->
 	<string name="scheduledForToday">Запланировано на сегодня</string>
 	<string name="completedToday">Выполнено сегодня</string>
 	<string name="lastPracticeDate">День прошлой практики</string>
 	<string name="scheduledCompletionDate">Ожидаемый день окончания</string>
 	<string name="dailyRepetitions">Ежедневных повторов</string>
 	<string name="completionDate">День окончания</string>
 	<string name="chooseAction">Выберите действие</string>
-	<string name="msgNoEditNgondro">Нельзя удалить нёндро. Если оно не нужно - его можно скрыть в настройках.</string>
+	<string name="msgNoEditNgondro">Нельзя удалить нёндро. Если оно не нужно - его
+		можно скрыть в настройках.</string>
 	<string name="error">Ошибка</string>
 	<string name="info">Информация</string>
 	<string name="confirmDeletionMsg">Точно удалить практику?</string>
 	<string name="confirmDeletionTitle">Подтвердите</string>
 	<string name="scheduled">Запланировано:</string>
-    <string name="completed">, выполнено:</string>
+	<string name="completed">, выполнено:</string>
 	<string name="howMuch">Сколько добавим?</string>
 	<string name="stopTimer">Остановить таймер</string>
-    <string name="startTimer">Запустить таймер</string>
+	<string name="startTimer">Запустить таймер</string>
 	<string name="addMala">Добавить</string>
 	<string name="setMalaCount">Задать число</string>
+
+	<string name="about">О программе...</string>
+	<string name="hi">Привет!</string>
+	<string name="version">v4 Mantra\n\nНаписана Doo Reelkow\nНемецкий и
+		испанский перевод\nФилиппа Роллингера\n\nКармапа ченно!</string>
+	<string name="support">Поддержка/обсуждение→</string>
+	<string name="support_web_warning">Блог программы</string>
+
+	<string name="oneBeadHeptic">Жужжать иначе</string>
+	<string name="oneBeadHepticSummary">Использовать разное жужжание для каждой 10 и 50
+		\"бусины\"</string>
+	<string name="dimNight">Затемнять вечером</string>
+	<string name="dimNightSummary">Затемнять экран сессии во время вечерних сессий
+	</string>
+	<string name="versionInfo">Версия</string>
+	<string name="postInstallWelcome">Приветствую в новом трекере\nСледующая версия будет
+		мочь синхронизироваться с Гуглодокументами. Для того, чтоб убедиться,
+		что эта функция работает мне нужны помощники. Кроме того всегда приветствуются 
+		пожелания и комментарии. Поэтому я буду рад если вы время от времени будете 
+		заходить в блог трекера по ссылке внизу (она есть в настройках/поддержка)\n\n
+		Ваш, Doo Reelkow.</string>
+
 </resources>
diff --git a/MeditationTracker/src/com/meditationtracker/PracticeActivity.java b/MeditationTracker/src/com/meditationtracker/PracticeActivity.java
@@ -50,11 +50,10 @@ public void onCreate(Bundle savedInstanceState)
 	private void updateView()
 	{
 		Bundle extras = getIntent().getExtras();
-		id = extras.getLong(ExtraKeys.ID);
 
 		if (extras != null && extras.containsKey(ExtraKeys.ID))
 		{
-			extras.getLong(ExtraKeys.ID);
+			id = extras.getLong(ExtraKeys.ID);
 			db = new PracticeDatabase(this);
 			practice = db.getPractice(id);
 

diff --git a/dootil/src/doo/alarm/AlarmHelper.java b/dootil/src/doo/alarm/AlarmHelper.java
@@ -38,7 +38,7 @@ protected static void updateAlarm(Context ctx, Boolean enabled,
 
 			futureTime.set(1, 1, 1, alarmTime / 60, alarmTime % 60);
 
-			long millisecondsAfter = AlarmOperator.GetMillisecondsAfter(calNow,
+			long millisecondsAfter = AlarmOperator.getMillisecondsAfter(calNow,
 					futureTime);
 			operator.setAlarm(alarmReceiverClass, millisecondsAfter, Integer
 					.toString(alarmId));

diff --git a/dootil/src/doo/alarm/AlarmOperator.java b/dootil/src/doo/alarm/AlarmOperator.java
@@ -54,7 +54,7 @@ public void removeAlarm(Class<? extends BroadcastReceiver> alarmClass, String al
 	 * @param pastTime, start point for calculation, normally "now"
 	 * @return milliseconds between pastTime and nearest future at futureTime
 	 */
-	public static long GetMillisecondsAfter(Calendar pastTime, Calendar futureTime)
+	public static long getMillisecondsAfter(Calendar pastTime, Calendar futureTime)
 	{
 		Calendar future = Calendar.getInstance();
 		future.set(pastTime.get(Calendar.YEAR), pastTime.get(Calendar.MONTH), pastTime.get(Calendar.DAY_OF_MONTH), futureTime.get(Calendar.HOUR_OF_DAY), futureTime.get(Calendar.MINUTE), 0);