Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made new strings (and a couple previously missed) translatable)

Browse Source
This commit is contained in:
Ciaran Gultnieks 2010-11-14 22:28:08 +00:00
parent 55c06a203e
commit ab8feedea0
4 changed files with 31 additions and 15 deletions

14
res/values/strings.xml

@ -1,5 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <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="app_name">FDroid</string>
<string name="about_title">About FDroid</string> <string name="about_title">About FDroid</string>
<string name="about_desc">Originally based on Aptoide.\nReleased under the GNU GPL v2 <string name="about_desc">Originally based on Aptoide.\nReleased under the GNU GPL v2

22
res/xml/preferences.xml

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="Storage"> <PreferenceCategory android:title="@string/storage">
<CheckBoxPreference android:title="Cache downloaded apps" <CheckBoxPreference android:title="@string/cache_downloaded"
android:defaultValue="false" android:summary="Keep downloaded apk files on SD card" android:defaultValue="false" android:summary="@string/keep_downloaded"
android:key="cacheDownloaded" /> android:key="cacheDownloaded" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="Updates"> <PreferenceCategory android:title="@string/updates">
<ListPreference android:title="Automatic repo scan" <ListPreference android:title="@string/automatic_repo_scan"
android:summary="Update apps list from repositories automatically" android:summary="@string/update_apps_list"
android:key="updateInterval" android:defaultValue="0" android:key="updateInterval" android:defaultValue="0"
android:entries="@array/updateIntervalNames" android:entryValues="@array/updateIntervalValues" /> android:entries="@array/updateIntervalNames" android:entryValues="@array/updateIntervalValues" />
<CheckBoxPreference android:title="Notify" <CheckBoxPreference android:title="@string/notify"
android:defaultValue="false" android:summary="Notify when new updates are available" android:defaultValue="false" android:summary="@string/notify_updates_available"
android:key="updateNotify" /> android:key="updateNotify" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="Maintenance"> <PreferenceCategory android:title="@string/maintenance">
<Preference <Preference
android:title="Reset" android:title="@string/reset"
android:summary="Clear all cached data" android:summary="@string/clear_all_cached_data"
android:key="reset" /> android:key="reset" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

2
src/org/fdroid/fdroid/AppDetails.java

@ -99,7 +99,7 @@ public class AppDetails extends ListActivity {
DB.Apk apk = items.get(position); DB.Apk apk = items.get(position);
TextView version = (TextView) v.findViewById(R.id.version); TextView version = (TextView) v.findViewById(R.id.version);
boolean iscurrent = apk.vercode == app_currentvercode; 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); TextView status = (TextView) v.findViewById(R.id.status);
if (apk.version.equals(app.installedVersion)) if (apk.version.equals(app.installedVersion))
status.setText(getString(R.string.inst)); status.setText(getString(R.string.inst));

8
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); TextView name = (TextView) v.findViewById(R.id.name);
name.setText(app.name); name.setText(app.name);
String vs = " versions available"; String vs;
int numav = app.apks.size(); int numav = app.apks.size();
if (numav == 1) 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); 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); TextView license = (TextView) v.findViewById(R.id.license);
license.setText(app.license); license.setText(app.license);