diff --git a/locale/de.po b/locale/de.po new file mode 100644 index 000000000..48a930454 --- /dev/null +++ b/locale/de.po @@ -0,0 +1,299 @@ +# Translations template for PROJECT. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2010. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-10-28 13:22+0100\n" +"PO-Revision-Date: 2010-10-28 14:38+0200\n" +"Last-Translator: Administrator <>\n" +"Language-Team: LANGUAGE \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.1.1\n" +"Generated-By: Babel 1.0dev\n" + +msgctxt "app_name" +msgid "FDroid" +msgstr "FDroid" + +msgctxt "about_title" +msgid "About FDroid" +msgstr "" + +msgctxt "about_desc" +msgid "" +"Based on Aptoide.\n" +"Released under the GNU GPL v2 license." +msgstr "" + +msgctxt "about_site" +msgid "Home:" +msgstr "" + +msgctxt "about_mail" +msgid "e-Mail:" +msgstr "" + +msgctxt "about_website" +msgid "Web Site" +msgstr "" + +msgctxt "no_found" +msgid "No application found!" +msgstr "" + +msgctxt "no_repo" +msgid "" +"You have no repositories configured!\n" +"\n" +"A repository is a source of applications. To add one, press the MENU " +"button now and enter the URL.\n" +"\n" +"A repository URL looks something like this: http://f-droid.org/repo" +msgstr "" + +msgctxt "not_inst" +msgid "Not Installed" +msgstr "" + +msgctxt "installed" +msgid "Installed - Ver.:" +msgstr "" + +msgctxt "installed_update" +msgid "Update possible - Ver.:" +msgstr "" + +msgctxt "error" +msgid "Error" +msgstr "" + +msgctxt "ok" +msgid "Ok" +msgstr "" + +msgctxt "yes" +msgid "Yes" +msgstr "" + +msgctxt "no" +msgid "No" +msgstr "" + +msgctxt "repo_add_title" +msgid "Add new repository" +msgstr "" + +msgctxt "repo_add_add" +msgid "Add" +msgstr "" + +msgctxt "cancel" +msgid "Cancel" +msgstr "" + +msgctxt "repo_delete_title" +msgid "Chose repository to remove" +msgstr "" + +msgctxt "url_website" +msgid "http://f-droid.org" +msgstr "" + +msgctxt "server_connection_error" +msgid "Could not connect to server!" +msgstr "" + +msgctxt "repo_update_title" +msgid "Update repositories" +msgstr "" + +msgctxt "tab_installed" +msgid "Installed" +msgstr "" + +msgctxt "tab_noninstalled" +msgid "Available" +msgstr "" + +msgctxt "tab_updates" +msgid "Updates" +msgstr "" + +msgctxt "update_available" +msgid "Updates available" +msgstr "" + +msgctxt "process_wait_title" +msgid "Please Wait" +msgstr "" + +msgctxt "process_update_msg" +msgid "Updating application list..." +msgstr "" + +msgctxt "connection_error" +msgid "Could not connect to the network." +msgstr "" + +msgctxt "connection_timeout" +msgid "Timeout" +msgstr "" + +msgctxt "connection_error_msg" +msgid "Could not connect to server!" +msgstr "" + +msgctxt "download" +msgid "Download" +msgstr "" + +msgctxt "download_server" +msgid "Getting application from" +msgstr "" + +msgctxt "apk_version_new" +msgid "available v" +msgstr "" + +msgctxt "settings_sort_title" +msgid "Sort application list by:" +msgstr "" + +msgctxt "settings_sort_abc" +msgid "Alphabetically" +msgstr "" + +msgctxt "settings_sort_installed" +msgid "Installed / Not Installed" +msgstr "" + +msgctxt "settings_sort_recent" +msgid "Most recent first" +msgstr "" + +msgctxt "settings_sort_rating" +msgid "Rating" +msgstr "" + +msgctxt "settings_filter_title" +msgid "Show applications:" +msgstr "" + +msgctxt "settings_filter_category" +msgid "By category" +msgstr "" + +msgctxt "settings_filter_all" +msgid "All applications" +msgstr "" + +msgctxt "settings_save" +msgid "Save" +msgstr "" + +msgctxt "repo_add_url" +msgid "Repository URL" +msgstr "" + +msgctxt "up_server" +msgid "Servers:" +msgstr "" + +msgctxt "lstver" +msgid "Server version:" +msgstr "" + +msgctxt "isinst" +msgid "Installed:" +msgstr "" + +msgctxt "instver" +msgid "Installed version:" +msgstr "" + +msgctxt "install" +msgid "Install" +msgstr "" + +msgctxt "uninstall" +msgid "Uninstall" +msgstr "" + +msgctxt "update" +msgid "Update!" +msgstr "" + +msgctxt "update_alrt" +msgid "" +"There updates available for some installed applications.\n" +"Do you wish to see them?" +msgstr "" + +msgctxt "repo_alrt" +msgid "" +"The list of repositories in use has been changed.\n" +"Do you wish to update them?" +msgstr "" + +msgctxt "error_download_alrt" +msgid "Could not connect to server or apk file is corrupt!" +msgstr "" + +msgctxt "download_alrt" +msgid "Getting application from:\n" +msgstr "" + +msgctxt "menu_update_repo" +msgid "Update" +msgstr "" + +msgctxt "menu_manage" +msgid "Manage Repos" +msgstr "" + +msgctxt "menu_about" +msgid "About" +msgstr "" + +msgctxt "menu_add_repo" +msgid "New Repository" +msgstr "" + +msgctxt "menu_rem_repo" +msgid "Remove Repository" +msgstr "" + +msgctxt "menu_install" +msgid "Install" +msgstr "" + +msgctxt "menu_uninstall" +msgid "Uninstall" +msgstr "" + +msgctxt "menu_website" +msgid "Web Site" +msgstr "" + +msgctxt "menu_issues" +msgid "Issues" +msgstr "" + +msgctxt "menu_source" +msgid "Source Code" +msgstr "" + +msgctxt "menu_market" +msgid "Market" +msgstr "" + +msgctxt "menu_update" +msgid "Update" +msgstr "" diff --git a/locale/template.pot b/locale/template.pot new file mode 100644 index 000000000..4782d9bab --- /dev/null +++ b/locale/template.pot @@ -0,0 +1,299 @@ +# Translations template for PROJECT. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2010. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-10-28 13:22+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 1.0dev\n" + +msgctxt "app_name" +msgid "FDroid" +msgstr "" + +msgctxt "about_title" +msgid "About FDroid" +msgstr "" + +msgctxt "about_desc" +msgid "" +"Based on Aptoide.\n" +"Released under the GNU GPL v2 license." +msgstr "" + +msgctxt "about_site" +msgid "Home:" +msgstr "" + +msgctxt "about_mail" +msgid "e-Mail:" +msgstr "" + +msgctxt "about_website" +msgid "Web Site" +msgstr "" + +msgctxt "no_found" +msgid "No application found!" +msgstr "" + +msgctxt "no_repo" +msgid "" +"You have no repositories configured!\n" +"\n" +"A repository is a source of applications. To add one, press the MENU " +"button now and enter the URL.\n" +"\n" +"A repository URL looks something like this: http://f-droid.org/repo" +msgstr "" + +msgctxt "not_inst" +msgid "Not Installed" +msgstr "" + +msgctxt "installed" +msgid "Installed - Ver.:" +msgstr "" + +msgctxt "installed_update" +msgid "Update possible - Ver.:" +msgstr "" + +msgctxt "error" +msgid "Error" +msgstr "" + +msgctxt "ok" +msgid "Ok" +msgstr "" + +msgctxt "yes" +msgid "Yes" +msgstr "" + +msgctxt "no" +msgid "No" +msgstr "" + +msgctxt "repo_add_title" +msgid "Add new repository" +msgstr "" + +msgctxt "repo_add_add" +msgid "Add" +msgstr "" + +msgctxt "cancel" +msgid "Cancel" +msgstr "" + +msgctxt "repo_delete_title" +msgid "Chose repository to remove" +msgstr "" + +msgctxt "url_website" +msgid "http://f-droid.org" +msgstr "" + +msgctxt "server_connection_error" +msgid "Could not connect to server!" +msgstr "" + +msgctxt "repo_update_title" +msgid "Update repositories" +msgstr "" + +msgctxt "tab_installed" +msgid "Installed" +msgstr "" + +msgctxt "tab_noninstalled" +msgid "Available" +msgstr "" + +msgctxt "tab_updates" +msgid "Updates" +msgstr "" + +msgctxt "update_available" +msgid "Updates available" +msgstr "" + +msgctxt "process_wait_title" +msgid "Please Wait" +msgstr "" + +msgctxt "process_update_msg" +msgid "Updating application list..." +msgstr "" + +msgctxt "connection_error" +msgid "Could not connect to the network." +msgstr "" + +msgctxt "connection_timeout" +msgid "Timeout" +msgstr "" + +msgctxt "connection_error_msg" +msgid "Could not connect to server!" +msgstr "" + +msgctxt "download" +msgid "Download" +msgstr "" + +msgctxt "download_server" +msgid "Getting application from" +msgstr "" + +msgctxt "apk_version_new" +msgid "available v" +msgstr "" + +msgctxt "settings_sort_title" +msgid "Sort application list by:" +msgstr "" + +msgctxt "settings_sort_abc" +msgid "Alphabetically" +msgstr "" + +msgctxt "settings_sort_installed" +msgid "Installed / Not Installed" +msgstr "" + +msgctxt "settings_sort_recent" +msgid "Most recent first" +msgstr "" + +msgctxt "settings_sort_rating" +msgid "Rating" +msgstr "" + +msgctxt "settings_filter_title" +msgid "Show applications:" +msgstr "" + +msgctxt "settings_filter_category" +msgid "By category" +msgstr "" + +msgctxt "settings_filter_all" +msgid "All applications" +msgstr "" + +msgctxt "settings_save" +msgid "Save" +msgstr "" + +msgctxt "repo_add_url" +msgid "Repository URL" +msgstr "" + +msgctxt "up_server" +msgid "Servers:" +msgstr "" + +msgctxt "lstver" +msgid "Server version:" +msgstr "" + +msgctxt "isinst" +msgid "Installed:" +msgstr "" + +msgctxt "instver" +msgid "Installed version:" +msgstr "" + +msgctxt "install" +msgid "Install" +msgstr "" + +msgctxt "uninstall" +msgid "Uninstall" +msgstr "" + +msgctxt "update" +msgid "Update!" +msgstr "" + +msgctxt "update_alrt" +msgid "" +"There updates available for some installed applications.\n" +"Do you wish to see them?" +msgstr "" + +msgctxt "repo_alrt" +msgid "" +"The list of repositories in use has been changed.\n" +"Do you wish to update them?" +msgstr "" + +msgctxt "error_download_alrt" +msgid "Could not connect to server or apk file is corrupt!" +msgstr "" + +msgctxt "download_alrt" +msgid "Getting application from:\n" +msgstr "" + +msgctxt "menu_update_repo" +msgid "Update" +msgstr "" + +msgctxt "menu_manage" +msgid "Manage Repos" +msgstr "" + +msgctxt "menu_about" +msgid "About" +msgstr "" + +msgctxt "menu_add_repo" +msgid "New Repository" +msgstr "" + +msgctxt "menu_rem_repo" +msgid "Remove Repository" +msgstr "" + +msgctxt "menu_install" +msgid "Install" +msgstr "" + +msgctxt "menu_uninstall" +msgid "Uninstall" +msgstr "" + +msgctxt "menu_website" +msgid "Web Site" +msgstr "" + +msgctxt "menu_issues" +msgid "Issues" +msgstr "" + +msgctxt "menu_source" +msgid "Source Code" +msgstr "" + +msgctxt "menu_market" +msgid "Market" +msgstr "" + +msgctxt "menu_update" +msgid "Update" +msgstr "" + diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml new file mode 100644 index 000000000..c78ad1d21 --- /dev/null +++ b/res/values-de/strings.xml @@ -0,0 +1,4 @@ + + + FDroid + diff --git a/res/values/alertstr.xml b/res/values/alertstr.xml deleted file mode 100644 index 41d31e1e0..000000000 --- a/res/values/alertstr.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - Servers: - Server version: - Installed: - Installed version: - Install - Uninstall - Update! - - There updates available for some installed applications.\nDo you wish to see them? - The list of repositories in use has been changed.\nDo you wish to update them? - - Could not connect to server or apk file is corrupt! - Getting application from:\n - - - - - diff --git a/res/values/menu.xml b/res/values/menu.xml deleted file mode 100644 index 262b4e8c3..000000000 --- a/res/values/menu.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - Update - Manage Repos - - - About - - - - New Repository - Remove Repository - - - -Install -Uninstall -Web Site -Issues -Source Code -Market -Update - - \ No newline at end of file diff --git a/res/values/path.xml b/res/values/path.xml deleted file mode 100644 index afacd7ae9..000000000 --- a/res/values/path.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - /sdcard/.fdroid/icons/ - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index cc1b4c002..ef243d127 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7,21 +7,14 @@ e-Mail: Web Site - No application found! + You have no repositories configured!\n\nA repository is a source of applications. To add one, press the MENU button now and enter the URL.\n\nA repository URL looks something like this: http://f-droid.org/repo Not Installed - Installed - Ver.: + Update possible - Ver.: - - - - - - - Error Ok Yes @@ -30,8 +23,8 @@ Add Cancel - Chose repository to remove - http://f-droid.org + Choose repository to remove + Could not connect to server! Update repositories @@ -47,15 +40,54 @@ Download Getting application from - available v -Sort application list by: -Alphabetically -Installed / Not Installed -Most recent first -Rating -Show applications: -By category -All applications -Save + + + + + + + + + + Repository URL + + + + Installed: + + Install + Uninstall + Update! + + There updates available for some installed applications.\nDo you wish to see them? + The list of repositories in use has been changed.\nDo you wish to update them? + + Could not connect to server or apk file is corrupt! + Getting application from:\n + + Update + Manage Repos + + + About + + + + New Repository + Remove Repository + + + +Install +Uninstall +Web Site +Issues +Source Code +Market +Update + +Version %s installed +Not installed (%d available) +Installed diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index 6b015fe79..508fd0cf5 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -99,9 +99,9 @@ public class AppDetails extends ListActivity { version.setText("Version " + apk.version); TextView status = (TextView) v.findViewById(R.id.status); if (apk.version.equals(app.installedVersion)) - status.setText("Installed"); + status.setText(getString(R.string.inst)); else - status.setText("Not installed"); + status.setText(getString(R.string.not_inst)); TextView size = (TextView) v.findViewById(R.id.size); if(apk.size==0) { size.setText(""); @@ -174,7 +174,7 @@ public class AppDetails extends ListActivity { // Set the icon... ImageView iv = (ImageView) findViewById(R.id.icon); - String icon_path = this.getString(R.string.icons_path) + app.icon; + String icon_path = DB.getIconsPath() + app.icon; File test_icon = new File(icon_path); if (test_icon.exists()) { iv.setImageDrawable(new BitmapDrawable(icon_path)); @@ -189,9 +189,10 @@ public class AppDetails extends ListActivity { tv.setText(app.license); tv = (TextView) findViewById(R.id.status); int vnum = app.apks.size(); - String v = vnum == 1 ? "version" : "versions"; - tv.setText("" + vnum + " " + v + ", " - + (app.installedVersion == null ? "not" : "1") + " installed"); + if(app.installedVersion == null) + tv.setText(String.format(getString(R.string.details_notinstalled),vnum)); + else + tv.setText(String.format(getString(R.string.details_installed), app.installedVersion)); tv = (TextView) findViewById(R.id.description); tv.setText(app.description); @@ -211,7 +212,7 @@ public class AppDetails extends ListActivity { curapk = app.apks.get(position); // Set the title and icon... - String icon_path = this.getString(R.string.icons_path) + app.icon; + String icon_path = DB.getIconsPath() + app.icon; File test_icon = new File(icon_path); if (test_icon.exists()) { p.setIcon(new BitmapDrawable(icon_path)); @@ -227,7 +228,7 @@ public class AppDetails extends ListActivity { installed = getString(R.string.yes); caninstall = false; } else { - installed += " - " + app.installedVersion; + installed = app.installedVersion; } } p.setMessage(getString(R.string.isinst) + " " + installed); diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java index 993105ea9..6d1c67975 100644 --- a/src/org/fdroid/fdroid/DB.java +++ b/src/org/fdroid/fdroid/DB.java @@ -160,6 +160,10 @@ public class DB { public int priority; } + public static String getIconsPath() { + return "/sdcard/.fdroid/icons/"; + } + private PackageManager mPm; public DB(Context ctx) { diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java index 06ec64197..82140da8d 100644 --- a/src/org/fdroid/fdroid/FDroid.java +++ b/src/org/fdroid/fdroid/FDroid.java @@ -130,9 +130,7 @@ public class FDroid extends TabActivity implements OnItemClickListener { summary.setText(app.summary); ImageView icon = (ImageView) v.findViewById(R.id.icon); - String iconpath = new String(FDroid.this - .getString(R.string.icons_path) - + app.icon); + String iconpath = new String(DB.getIconsPath() + app.icon); File icn = new File(iconpath); if (icn.exists() && icn.length() > 0) { new Uri.Builder().build(); @@ -190,7 +188,7 @@ public class FDroid extends TabActivity implements OnItemClickListener { if (!local_path.exists()) local_path.mkdir(); - File icon_path = new File(this.getString(R.string.icons_path)); + File icon_path = new File(DB.getIconsPath()); if (!icon_path.exists()) icon_path.mkdir(); @@ -261,11 +259,11 @@ public class FDroid extends TabActivity implements OnItemClickListener { public void onClick(DialogInterface dialog, int whichButton) { Uri uri = Uri - .parse(getString(R.string.url_website)); + .parse("http://f-droid.org"); startActivity(new Intent(Intent.ACTION_VIEW, uri)); } }); - alrt.setButton(AlertDialog.BUTTON_NEGATIVE, "Ok", + alrt.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/src/org/fdroid/fdroid/RepoXMLHandler.java index d7b84e879..19c115df3 100644 --- a/src/org/fdroid/fdroid/RepoXMLHandler.java +++ b/src/org/fdroid/fdroid/RepoXMLHandler.java @@ -29,8 +29,6 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import org.fdroid.fdroid.R; - import android.content.Context; import android.util.Log; @@ -142,7 +140,7 @@ public class RepoXMLHandler extends DefaultHandler { private void getIcon(DB.App app) { try { - String destpath = mctx.getString(R.string.icons_path) + app.icon; + String destpath = DB.getIconsPath() + app.icon; File f = new File(destpath); if (f.exists()) return;