Internationalized to German.

diff --git a/res/drawable/icon_old.png b/res/drawable/icon_old.png
deleted file mode 100644 (file)
index 17ccb38..0000000
Binary files a/res/drawable/icon_old.png and /dev/null differ

diff --git a/res/layout/about_activity.xml b/res/layout/about_activity.xml
index cfcf7464c47f06861cfdb134f3d734173d2901f9..781b682c1c6755816508e8c39979b4f185fcfa8e 100644 (file)
--- a/res/layout/about_activity.xml
+++ b/res/layout/about_activity.xml
@@ -22,7 +22,8 @@
                        android:layout_width="wrap_content" 
                        android:layout_height="wrap_content"
                        android:layout_gravity="center_horizontal"
-                       android:background="@drawable/icon"/>
+                       android:background="@drawable/icon" 
+      android:contentDescription="icon"/>
 
                <TextView 
                        android:id="@+id/title" 

diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index 53241e556287dc711fa3e11512839f7d922d15a9..56bb7555863b3565988f168025acab6977a8dc67 100644 (file)
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -13,7 +13,7 @@
                        <EditText 
                                android:id="@+id/SearchText"
                                android:hint="@string/searchText"
-                               android:layout_width="wrap_content"
+                               android:layout_width="0dip"
                                android:layout_height="wrap_content" 
         android:imeOptions="actionSearch|flagNoEnterAction|flagNoExtractUi"
                                android:layout_weight="1.0" 

diff --git a/res/layout/edit_activity.xml b/res/layout/edit_activity.xml
index d1fb9900158e3adbe326e863b83de45bc4d99df0..24c4b9cb9c00eb9572b52aa208e8fee0074e8e94 100755 (executable)
--- a/res/layout/edit_activity.xml
+++ b/res/layout/edit_activity.xml
@@ -19,7 +19,8 @@
     android:layout_width="wrap_content" 
     android:layout_height="wrap_content" />
   <EditText 
-    android:id="@+id/dictionaryName" 
+    android:id="@+id/dictionaryName"
+    android:inputType="textNoSuggestions" 
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" />
 
@@ -31,7 +32,8 @@
     android:layout_height="wrap_content"
     android:paddingTop="5dip" />
   <EditText 
-    android:id="@+id/localFile" 
+    android:id="@+id/localFile"
+    android:inputType="textUri"
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" />
 
@@ -44,6 +46,7 @@
     android:paddingTop="5dip" />
   <EditText 
     android:id="@+id/downloadUrl" 
+    android:inputType="textUri"
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" />
 

diff --git a/res/layout/list_activity.xml b/res/layout/list_activity.xml
index 037e13769d401802916b0908ad84447784f17105..e807ca1be9e4a048c171b30f2e3dc85254a971ac 100644 (file)
--- a/res/layout/list_activity.xml
+++ b/res/layout/list_activity.xml
@@ -8,7 +8,7 @@
        <ListView 
                android:id="@id/android:list" 
                android:layout_width="fill_parent"
-               android:layout_height="wrap_content" 
+               android:layout_height="0dip" 
                android:choiceMode="singleChoice"
                android:clickable="true" 
                android:focusable="true"
@@ -22,10 +22,10 @@
       <TextView 
         android:id="@+id/DictionaryListHeader"
         android:hint="@string/selectADictionary"
-        android:layout_width="wrap_content"
+        android:layout_width="0dip"
         android:layout_height="wrap_content" 
         android:imeOptions="actionSearch|flagNoEnterAction|flagNoExtractUi"
-        android:layout_weight="1.0" android:inputType="text"/>
+        android:inputType="text"/>
   </LinearLayout>
 
 </LinearLayout>

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
new file mode 100644 (file)
index 0000000..3813211
--- /dev/null
+++ b/res/values-de/arrays.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <string-array name="themeKeys">
+    <item>themeLight</item>
+    <item>themeDefault</item>
+  </string-array>
+
+  <string-array name="themes">
+    <item>Weiß-Theme</item>
+    <item>Standard-Theme</item>
+  </string-array>
+  
+</resources>
\ No newline at end of file

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
old mode 100755 (executable)
new mode 100644 (file)
index d1670c4..6257845
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2,51 +2,117 @@
 <resources>
 
        <string name="app_name">QuickDic</string>
-       <string name="about_text">QuickDic\nvon Thad Hughes</string>
-       
+ 
+  <!-- DictionaryListActivity -->
+  <string name="dictionaryList">Wörterbuch-Liste</string>
+  <string name="selectADictionary"><![CDATA[Wählen Sie ein Wörterbuch.\n
+Long-drücken, um das Wörterbuch Konfiguration zu bearbeiten. Drücken Sie "Menü", um ein neues Wörterbuch hinzufügen.]]></string>
+  <string name="addDictionary">Wörterbuch hinzufügen</string>
+  <string name="addDefaultDictionaries">Default Wörterbücher hinzufügen</string>
+  <string name="removeAllDictionaries">Alle Wörterbücher entfernen</string>
+  <string name="editDictionary">Wörterbuch Config bearbeiten</string>
+  <string name="deleteDictionary">Wörterbuch entfernen</string>
+  <string name="newDictionary">Neues Wörterbuch</string>
+  <string name="moveToTop">Nach Anfang ziehen</string>
+  <string name="notOnDevice">%s (nicht auf dem Gerät)</string>
+
+  <string name="thanksForUpdatingVersion">3.0.1k</string>
+  <!-- Don't use links in the text below, it crashes the app. -->
+  <string name="thanksForUpdating"><![CDATA[
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
+</head>
+<body>
+  Danke, da&szlig; Sie QuickDic 3.0.1 heruntergeladen haben.
+  <p> neue Funktionen:
+  <ul>
+    <li> QuickDic ist Open-Source!
+    <li> Neue Einstellungen:
+    <ul>
+      <li> W&ouml;rterbuch Schriftgr&ouml;&szlig;e ist einstellbar.
+      <li> Kurze Klicks auf W&ouml;rterbucheintr&auml;ge &ouml;ffnen Kontextmen&uuml; nicht mehr standardm&auml;&szlig;ig.
+    </ul>
+    <li> 17 neue Englische W&ouml;rterb&uuml;cher: Albanian, Armenian, Belarusian, Bengali, Bosnian, Bulgarian, Catalan, Esperanto, Estonian, Hungarian, Indonesian, Latin, Latvian, Polish, Punjabi, Slovak, Swahili. (von enwiktionary.com).
+    <li> Alle W&ouml;rterb&uuml;cher sind updated (meist mit besseren Formatierung) und k&ouml;nnen wiederheruntergeladen werden (zuvor heruntergeladene W&ouml;rterb&uuml;cher wird immer noch funktionieren).
+  </ul>
+</body>
+</html> 
+]]>
+  </string>
+ 
+  <!-- DictionaryEditActivity -->
+  <string name="dictionaryName">Wörterbuch Name</string>
+  <string name="downloadUrl">Wörterbuch URL</string>
+  <string name="downloadButton">Herunterladen</string>
+  <string name="openButton">Öffnen</string>
+  <string name="dictionaryInfo">Wörterbuch Info:</string>
+  <string name="localFile">Wörterbuch Datei</string>
+  <string name="wordListFile">Wortliste-Datei</string>
+  <string name="fileNotFound">Datei nicht gefunden: \'%s\'</string>
+  <string name="invalidDictionary">Ungültige Wörterbuch: file=%1$s, error=%2$s</string>
+  <string name="numPairEntries">Einträge: %,d</string>
+  <string name="numTokens">Tokens: %,d</string>
+  <string name="numRows">Reihe: %,d</string>
+
+ 
        <!-- Main -->
-       <string name="searchText">Stichwort</string>
-       <string name="downloadDictionary">Wörterbuch herunterladen...</string>
-       <string name="switchToLanguage">Switch to %s</string>
-       <string name="preferences">Einstellungen...</string>
-       <string name="about">Über QuickDic...</string>
-       <string name="addToWordList">Zu Wortliste hinzufugen: %s</string>
-  <string name="failedAddingToWordList">Fehler bei Wortliste hinzufugen: %s</string>
+       <string name="searchText">Suchtext</string>
+       <string name="downloadDictionary">Wörterbuch herunterladen…</string>
+       <string name="switchToLanguage">Zu %s wechseln</string>
+       <string name="preferences">Einstellungen…</string>
+       <string name="about">Über QuickDic…</string>
+       <string name="addToWordList">Zum Wortliste hinzufügen: %s</string>
+  <string name="failedAddingToWordList">Fehler beim Hinzufügen zur Wortliste: %s</string>
+  <string name="unzippingDictionary">Wörterbuch entpacken…</string>
+  <string name="failedToUnzipDictionary">Fehler beim Entpackung der Wörterbuch…</string>
 
        <!-- About. -->
-       <string name="contactMe">Wenn QuickDic dir gefällt, würde ich gern von dir hören.  Bitte schicke Bemerkungen, Aufforderungen, oder Programmfehler an:</string>
-       <string name="currentDictInfo">Wörterbuch Info:</string>
-       <string name="noDictLoaded">Kein Wörterbuch geöffnet.</string>
-       
+       <string name="titleWithVersion">QuickDic 3.0.1</string>
+       <string name="thadHughes">Thad Hughes</string>
+       <string name="contactMe">
+     Wenn Sie QuickDic benutzen, würde ich gerne von Ihnen hören.
+     Leider kann ich keine Verantwortung für die Wörterbücher (außer Formatierung) nehmen, weil sie aus anderen Quellen erzeugt werden.
+     Bitte senden Sie Kommentare, Anregungen, Bug-Reports, oder einfach nur ein schnelles Hallo an:
+  </string>
+       <string name="myEmail" formatted="false">thad.hughes@gmail.com</string>
+  <string name="webPage">Weitere Informationen finden Sie unter:</string>
+  <string name="webPageUrl">http://code.google.com/p/quickdic-dictionary/</string>
+  
+  <string name="license">QuickDic contains code copyrighted by Google and released under the Apache 2.0 license.</string>
+  <string name="licenseUrl">http://www.apache.org/licenses/LICENSE-2.0</string>
+ 
        <!-- Download. -->
-       <string name="downloading">%1$d von %2$d Bytes heruntergeladen...</string>
-       <string name="downloadFinished">Herunterladen fertig, %d Bytes heruntergeladen.</string>
-       <string name="errorDownloadingFile">"Fehler während des Herunterladens: \n%s"</string>
-
-  <!-- NoDictionary. -->
-  <string name="unableToReadDictionaryFile">Wörterbuch Datei existiert nicht (oder ist eine alte Version): %s</string>
-  <string name="DictionaryFileExists">Wörterbuch Datei existiert: %s</string>
-  <string name="launchDict">"Launch dictionary."</string>
+  <string name="openingConnection">Verbindungsaufbau…</string>
+       <string name="downloading">Herunterladen: %1$,d von %2$,d Bytes.</string>
+  <string name="unzipping">Entpackung: %1$,d von %2$,d Bytes.</string>
+       <string name="downloadFinished">Fertig: %,d Bytes.</string>
+       <string name="errorDownloadingFile">"Fehler beim Herunterladen: \n%s"</string>
 
        <!-- Preferences -->
        <string name="wordListFileKey">wordListFile</string>
-       <string name="wordListFileTitle">Wortliste Datei</string>
-       <string name="wordListFileSummary">Die Datei, in der neue Worte hinzugefügt werden.</string>
-       <string name="wordListFileDefault">/sdcard/quickdic/wordList.txt</string>
+       <string name="wordListFileTitle">Wortlist Datei</string>
+       <string name="wordListFileSummary">Die lokale Datei, wo das Wortliste hinzugefügt wird.</string>
+       <string name="wordListFileDefault">/sdcard/quickDic/wordList.txt</string>
+
+  <string name="fontSizeKey">fontSize</string>
+  <string name="fontSizeTitle">Schriftgröße</string>
+  <string name="fontSizeSummary">Die Größe der Schriftart für die Wörterbuch-Reihen (Neustart erforderlich).</string>
 
   <string name="saveOnlyFirstSubentryKey">saveOnlyFirstSubentry</string>
-  <string name="saveOnlyFirstSubentryTitle">Save only first sub-entry</string>
-  <string name="saveOnlyFirstSubentrySummary">For entries with multiple sub-entries, only write the first to the word list.</string>
+  <string name="saveOnlyFirstSubentryTitle">Speichern nur erste Sub-Eintrag</string>
+  <string name="saveOnlyFirstSubentrySummary">Bei Einträgen mit mehreren Sub-Einträge werden nur die ersten auf die Wortliste hinzugefügt.</string>
+
+  <string name="clickOpensContextMenuKey">clickOpensContextMenu</string>
+  <string name="clickOpensContextMenuTitle">Klick öffnet Kontextmenü</string>
+  <string name="clickOpensContextMenuSummary">Das Kontextmenü öffnet mit Klicks auf Einträge (long-Klicks öffnen immer das Kontextmenü).</string>
 
   <string name="showClearSearchTextButtonKey">showClearSearchTextButton</string>
-  <string name="showClearSearchTextButtonTitle">Show \'clear search text\' button</string>
-  <string name="showClearSearchTextButtonSummary">Show the button to clear the search text. You can also just move focus away from search text and start typing.</string>
-  
-       <string name="dictFileKey">dictFile</string>
-       <string name="dictFileTitle">Wörterbuch Datei</string>
-       <string name="dictFileSummary">Die Datei, die das Wörterbuch enthält (und worein das Wörterbuch heruntergeladen wird).</string>
+  <string name="showClearSearchTextButtonTitle">Zeige \'Suchtext entfernen\' Button</string>
+  <string name="showClearSearchTextButtonSummary">Zeigen die Button, um die Suchtext zu löschen. Sie können auch einfach weg von Suchtext konzentrieren und anfangen zu schreiben.</string>
 
-       <string name="dictFetchUrlTitle">Wörterbuch URL</string>
-       <string name="dictFetchUrlSummary">Das URL, wovon das Wörterbuch heruntergeladen wird.</string>
-       
+  <string name="themeKey">theme</string>
+  <string name="themeTitle">UI Theme</string>
+  <string name="themeSummary">User-Interface Farbschema (Neustart erforderlich).</string>
+  
 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba26101cedafc377eb96c15cfee945ac7608ec55..eded2086642cbda053c0cb10d44f10e5c138726f 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,7 +2,6 @@
 <resources>
 
        <string name="app_name">QuickDic</string>
-       <string name="about_text">QuickDic\nby Thad Hughes</string>
  
   <!-- DictionaryListActivity -->
   <string name="dictionaryList">Dictionary list</string>
@@ -17,6 +16,8 @@
   <string name="newDictionary">New dictionary</string>
   <string name="notOnDevice">%s (not on device)</string>
 
+  <string name="thanksForUpdatingVersion">3.0.1h</string>
+  <!-- Don't use links in the text below, it crashes the app. -->
   <string name="thanksForUpdating"><![CDATA[
 <html>
 <body>
@@ -24,18 +25,20 @@
   <p> New features:
   <ul>
     <li> QuickDic is open-source!
-    <li> Adjustable font size.
-    <li> Changeable click behavior.
-    <li> Several new dictionaries: Polish, Esperanto, Latin, Indonesian, many others... (based on enwiktionary.com data).
-    <li> All dictionaries updated (mostly with better formatting), and can be redownloaded at your leisure.
+    <li> New preferences:
+    <ul>
+      <li> Dictionary font size is adjustable.
+      <li> Short clicks on dictionary entries no longer open context menu by default.
+    </ul>
+    <li> 17 new English dictionaries: Albanian, Armenian, Belarusian, Bengali, Bosnian, Bulgarian, Catalan, Esperanto, Estonian, Hungarian, Indonesian, Latin, Latvian, Polish, Punjabi, Slovak, Swahili. (based on enwiktionary.com data).
+    <li> All dictionaries updated (mostly with better formatting), and can be re-downloaded at your leisure (previously downloaded dictionaries will still work).
   </ul>
 </body>
-</html>
+</html> 
 ]]>
   </string>
  
   <!-- DictionaryEditActivity -->
-  <string name="dictionaryEdit">Edit dictionary config</string>
   <string name="dictionaryName">Dictionary name</string>
   <string name="downloadUrl">Dictionary download URL</string>
   <string name="downloadButton">Download</string>
@@ -79,11 +82,6 @@
        <string name="downloadFinished">Finished: %,d bytes.</string>
        <string name="errorDownloadingFile">"Error downloading file: \n%s"</string>
 
-  <!-- NoDictionary. -->
-  <string name="unableToReadDictionaryFile">Unable to read dictionary file (or version is old, try downloading again): %s</string>
-  <string name="dictionaryFileExists">Dictionary file exists: %s</string>
-  <string name="launchDict">Launch dictionary.</string>
-
        <!-- Preferences -->
        <string name="wordListFileKey">wordListFile</string>
        <string name="wordListFileTitle">Word list file</string>

diff --git a/src/com/hughes/android/dictionary/C.java b/src/com/hughes/android/dictionary/C.java
index 76af93d7134f04d24773b6d2d1a529e29828a28f..b7f4126936c2609d704c82e67f1afd947216207d 100644 (file)
--- a/src/com/hughes/android/dictionary/C.java
+++ b/src/com/hughes/android/dictionary/C.java
@@ -22,7 +22,7 @@ public class C {
   static final String INDEX_INDEX = "indexIndex";
   static final String SEARCH_TOKEN = "searchToken";
 
-  public static final String INTRO_MESSAGE_SHOWN = "introMessageShown";
+  public static final String THANKS_FOR_UPDATING_VERSION = "thanksForUpdatingVersion";
 
 
 }

diff --git a/src/com/hughes/android/dictionary/DictionaryListActivity.java b/src/com/hughes/android/dictionary/DictionaryListActivity.java
index 123e0b5354eba7876142a352cedd20e976ef9401..b51dd282065bba68f4b056a08021e2b1eea7d8d0 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryListActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryListActivity.java
@@ -33,6 +33,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.WindowManager;
 import android.webkit.WebView;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
@@ -71,8 +72,8 @@ public class DictionaryListActivity extends ListActivity {
     registerForContextMenu(getListView());
 
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    final int introMessageId = 100;
-    if (prefs.getInt(C.INTRO_MESSAGE_SHOWN, 0) < introMessageId) {
+    final String thanksForUpdatingLatestVersion = getString(R.string.thanksForUpdatingVersion);
+    if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(thanksForUpdatingLatestVersion)) {
       final AlertDialog.Builder builder = new AlertDialog.Builder(this);
       builder.setCancelable(false);
       final WebView webView = new WebView(getApplicationContext());
@@ -84,8 +85,13 @@ public class DictionaryListActivity extends ListActivity {
           }
       });
       final AlertDialog alert = builder.create();
+      WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
+      layoutParams.copyFrom(alert.getWindow().getAttributes());
+      layoutParams.width = WindowManager.LayoutParams.FILL_PARENT;
+      layoutParams.height = WindowManager.LayoutParams.FILL_PARENT;
       alert.show();
-      prefs.edit().putInt(C.INTRO_MESSAGE_SHOWN, introMessageId).commit();
+      alert.getWindow().setAttributes(layoutParams);
+      prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion).commit();
     }
   }