A little bit of pre-localisation tidying up

This commit is contained in:
Ciaran Gultnieks 2010-10-28 17:57:57 +01:00
parent 76c7f74cd2
commit 6147cf4b46
11 changed files with 673 additions and 142 deletions

299
locale/de.po Normal file
View File

@ -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 <EMAIL@ADDRESS>, 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 <LL@li.org>\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 ""

299
locale/template.pot Normal file
View File

@ -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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""

View File

@ -0,0 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">FDroid</string>
</resources>

View File

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="up_server">Servers: </string>
<string name="lstver">Server version: </string>
<string name="isinst">Installed: </string>
<string name="instver">Installed version: </string>
<string name="install">Install </string>
<string name="uninstall">Uninstall </string>
<string name="update">Update!</string>
<string name="update_alrt">There updates available for some installed applications.\nDo you wish to see them?</string>
<string name="repo_alrt">The list of repositories in use has been changed.\nDo you wish to update them?</string>
<string name="error_download_alrt">Could not connect to server or apk file is corrupt!</string>
<string name="download_alrt">Getting application from:\n </string>
</resources>
<!--
* Copyright (C) 2009 Roberto Jacinto
* roberto.jacinto@caixamagica.pt
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->

View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="menu_update_repo">Update</string>
<string name="menu_manage">Manage Repos</string>
<string name="menu_about">About</string>
<string name="menu_add_repo">New Repository</string>
<string name="menu_rem_repo">Remove Repository</string>
<string name="menu_install">Install</string>
<string name="menu_uninstall">Uninstall</string>
<string name="menu_website">Web Site</string>
<string name="menu_issues">Issues</string>
<string name="menu_source">Source Code</string>
<string name="menu_market">Market</string>
<string name="menu_update">Update</string>
</resources>
<!--
* Copyright (C) 2009 Roberto Jacinto
* roberto.jacinto@caixamagica.pt
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->

View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="icons_path">/sdcard/.fdroid/icons/</string>
</resources>
<!--
* Copyright (C) 2009 Roberto Jacinto
* roberto.jacinto@caixamagica.pt
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->

View File

@ -7,21 +7,14 @@
<string name="about_mail">e-Mail: </string>
<string name="about_website">Web Site</string>
<string name="no_found">No application found!</string>
<string name="no_repo">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</string>
<string name="not_inst">Not Installed</string>
<string name="installed">Installed - Ver.:</string>
<string name="installed_update">Update possible - Ver.:</string>
<string name="error">Error</string>
<string name="ok">Ok</string>
<string name="yes">Yes</string>
@ -30,8 +23,8 @@
<string name="repo_add_add">Add</string>
<string name="cancel">Cancel</string>
<string name="repo_delete_title">Chose repository to remove</string>
<string name="url_website">http://f-droid.org</string>
<string name="repo_delete_title">Choose repository to remove</string>
<string name="server_connection_error">Could not connect to server!</string>
<string name="repo_update_title">Update repositories</string>
@ -47,15 +40,54 @@
<string name="download">Download</string>
<string name="download_server">Getting application from</string>
<string name="apk_version_new"> available v </string>
<string name="settings_sort_title">Sort application list by:</string>
<string name="settings_sort_abc">Alphabetically</string>
<string name="settings_sort_installed">Installed / Not Installed</string>
<string name="settings_sort_recent">Most recent first</string>
<string name="settings_sort_rating">Rating</string>
<string name="settings_filter_title">Show applications:</string>
<string name="settings_filter_category">By category</string>
<string name="settings_filter_all">All applications</string>
<string name="settings_save">Save</string>
<string name="repo_add_url">Repository URL</string>
<string name="isinst">Installed: </string>
<string name="install">Install </string>
<string name="uninstall">Uninstall </string>
<string name="update">Update!</string>
<string name="update_alrt">There updates available for some installed applications.\nDo you wish to see them?</string>
<string name="repo_alrt">The list of repositories in use has been changed.\nDo you wish to update them?</string>
<string name="error_download_alrt">Could not connect to server or apk file is corrupt!</string>
<string name="download_alrt">Getting application from:\n </string>
<string name="menu_update_repo">Update</string>
<string name="menu_manage">Manage Repos</string>
<string name="menu_about">About</string>
<string name="menu_add_repo">New Repository</string>
<string name="menu_rem_repo">Remove Repository</string>
<string name="menu_install">Install</string>
<string name="menu_uninstall">Uninstall</string>
<string name="menu_website">Web Site</string>
<string name="menu_issues">Issues</string>
<string name="menu_source">Source Code</string>
<string name="menu_market">Market</string>
<string name="menu_update">Update</string>
<string name="details_installed">Version %s installed</string>
<string name="details_notinstalled">Not installed (%d available)</string>
<string name="inst">Installed</string>
</resources>

View File

@ -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);

View File

@ -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) {

View File

@ -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) {

View File

@ -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;