From ab8feedea06f278755d83862fce168d8792abf43 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 14 Nov 2010 22:28:08 +0000
Subject: [PATCH] Made new strings (and a couple previously missed)
 translatable)

---
 res/values/strings.xml                | 14 ++++++++++++++
 res/xml/preferences.xml               | 22 +++++++++++-----------
 src/org/fdroid/fdroid/AppDetails.java |  2 +-
 src/org/fdroid/fdroid/FDroid.java     |  8 +++++---
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ec4983b4..daa227144 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="version">Version</string>
+    <string name="n_versions_available">%d versions available</string>
+    <string name="n_version_available">%d version available</string>
+    <string name="notify">Notify</string>
+    <string name="storage">Storage</string>
+    <string name="cache_downloaded">Cache downloaded apps</string>
+    <string name="keep_downloaded">Keep downloaded apk files on SD card</string>
+    <string name="updates">Updates</string>
+    <string name="clear_all_cached_data">Clear all cached data</string>
+    <string name="reset">Reset</string>
+    <string name="maintenance">Maintenance</string>
+    <string name="notify_updates_available">Notify when new updates are available</string>
+    <string name="update_apps_list">Update apps list from repositories automatically</string>
+    <string name="automatic_repo_scan">Automatic repo scan</string>
 	<string name="app_name">FDroid</string>
 	<string name="about_title">About FDroid</string>
 	<string name="about_desc">Originally based on Aptoide.\nReleased under the GNU GPL v2
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 83a4752e6..3722a1024 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-	<PreferenceCategory android:title="Storage">
-		<CheckBoxPreference android:title="Cache downloaded apps"
-			android:defaultValue="false" android:summary="Keep downloaded apk files on SD card"
+	<PreferenceCategory android:title="@string/storage">
+		<CheckBoxPreference android:title="@string/cache_downloaded"
+			android:defaultValue="false" android:summary="@string/keep_downloaded"
 			android:key="cacheDownloaded" />
 	</PreferenceCategory>
-	<PreferenceCategory android:title="Updates">
-		<ListPreference android:title="Automatic repo scan"
-			android:summary="Update apps list from repositories automatically"
+	<PreferenceCategory android:title="@string/updates">
+		<ListPreference android:title="@string/automatic_repo_scan"
+			android:summary="@string/update_apps_list"
 			android:key="updateInterval" android:defaultValue="0"
 			android:entries="@array/updateIntervalNames" android:entryValues="@array/updateIntervalValues" />
-		<CheckBoxPreference android:title="Notify"
-			android:defaultValue="false" android:summary="Notify when new updates are available"
+		<CheckBoxPreference android:title="@string/notify"
+			android:defaultValue="false" android:summary="@string/notify_updates_available"
 			android:key="updateNotify" />
 	</PreferenceCategory>
-	<PreferenceCategory android:title="Maintenance">
+	<PreferenceCategory android:title="@string/maintenance">
 	        <Preference
-                android:title="Reset"
-                android:summary="Clear all cached data"
+                android:title="@string/reset"
+                android:summary="@string/clear_all_cached_data"
                 android:key="reset" />
 	</PreferenceCategory>	
 </PreferenceScreen>
diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 8ae78a021..ab70b60f3 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -99,7 +99,7 @@ public class AppDetails extends ListActivity {
             DB.Apk apk = items.get(position);
             TextView version = (TextView) v.findViewById(R.id.version);
             boolean iscurrent = apk.vercode == app_currentvercode;
-            version.setText("Version " + apk.version + (iscurrent ? "*" : ""));
+            version.setText(R.string.version + " " + apk.version + (iscurrent ? "*" : ""));
             TextView status = (TextView) v.findViewById(R.id.status);
             if (apk.version.equals(app.installedVersion))
                 status.setText(getString(R.string.inst));
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 97da287f7..fb09ebc49 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -102,12 +102,14 @@ public class FDroid extends TabActivity implements OnItemClickListener {
             TextView name = (TextView) v.findViewById(R.id.name);
             name.setText(app.name);
 
-            String vs = " versions available";
+            String vs;
             int numav = app.apks.size();
             if (numav == 1)
-                vs = " version available";
+                vs = getString(R.string.n_version_available);
+            else
+                vs = getString(R.string.n_versions_available);
             TextView status = (TextView) v.findViewById(R.id.status);
-            status.setText(numav + vs);
+            status.setText(String.format(vs, numav));
 
             TextView license = (TextView) v.findViewById(R.id.license);
             license.setText(app.license);