Fixed a crash when opening the preferences in Android 2.

Updated French translation.
arnowelzel · Aug 27, 2014 · 97419af · 97419af
1 parent b93cfa8
commit 97419af
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="de.arnowelzel.android.periodical"
-      android:versionCode="15"
-      android:versionName="0.15"
+      android:versionCode="16"
+      android:versionName="0.16"
       android:installLocation="auto">
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+0.16
+
+Fixed a crash when opening the preferences in Android 2.
+
+Updated French translation.
+
 0.15
 
 Changed from Eclipse to IntelliJ IDEA.

diff --git a/res/raw-de/about.html b/res/raw-de/about.html
@@ -5,7 +5,7 @@
     <title>Über</title>
 </head>
 <body>
-<h1>Periodical 0.15</h1>
+<h1>Periodical 0.16</h1>
 <h2>Berechnung der Fruchtbarkeit nach  Knaus-Ogino<br />
 Copyright © 2012-2014 Arno Welzel</h2>
 

diff --git a/res/raw-fr/about.html b/res/raw-fr/about.html
@@ -5,7 +5,7 @@
     <title>À propos</title>
 </head>
 <body>
-<h1>Periodical 0.15</h1>
+<h1>Periodical 0.16</h1>
 <h2>Calcul de la fertilité selon la méthode Knaus-Ogino<br />
 Copyright © 2012-2014 Arno Welzel</h2>
 

diff --git a/res/raw/about.html b/res/raw/about.html
@@ -5,7 +5,7 @@
     <title>About</title>
 </head>
 <body>
-<h1>Periodical 0.15</h1>
+<h1>Periodical 0.16</h1>
 <h2>Calculation of fertility according to Knaus&#8211;Ogino<br />
 Copyright © 2012&#8211;2014 Arno Welzel</h2>
 

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -7,7 +7,7 @@
     <string name="menuitem_list">Tableau</string>
     <string name="menuitem_copy">Sauvegarder</string>
     <string name="menuitem_restore">Restaurer</string>
-    <string name="menuitem_options">Préférences</string>
+    <string name="menuitem_options">Paramètre</string>
     <string name="menuitem_exit">Terminer</string>
     <string name="main_button_prev">&lt;</string>
     <string name="main_button_next">&gt;</string>
@@ -42,7 +42,7 @@
     <string name="calendaraction_remove">Retirer la marque \"Début des règles\" pour ce jour ?</string>
     <string name="calendaraction_ok">Oui</string>
     <string name="calendaraction_cancel">Non</string>
-    <string name="options_title">Préférences</string>
+    <string name="options_title">Paramètre</string>
     <string name="pref_periodlength">Longueur par défaut de la règles (journées)</string>
     <string name="invalid_period_length">La longueur standard de la période doit être 1-14!</string>
 </resources>
diff --git a/src/de/arnowelzel/android/periodical/OptionsActivity.java b/src/de/arnowelzel/android/periodical/OptionsActivity.java
@@ -125,10 +125,6 @@ private void updatePrefSummary(Preference p) {
                 p.setSummary(editTextPref.getText());
             }
         }
-        if (p instanceof MultiSelectListPreference) {
-            EditTextPreference editTextPref = (EditTextPreference) p;
-            p.setSummary(editTextPref.getText());
-        }
     }
 
     /* Handler for ICS "home" button */