From 0da25367230ff30664ebb413954d752101115e34 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Wed, 22 Jul 2009 02:54:44 -0700 Subject: [PATCH] Merge from 2.8.8 ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions. --- AndroidManifest.xml | 6 +- bin/androidxml2po.bash | 4 +- res/layout/main.xml | 7 - res/layout/task_list_row.xml | 2 + res/values-ca/strings.xml | 15 +- res/values-de/strings.xml | 20 +- res/values-es/strings.xml | 18 +- res/values-fr/arrays.xml | 117 ++ res/values-fr/strings.xml | 440 +++++++ res/values-id/arrays.xml | 117 -- res/values-id/strings.xml | 436 ------- res/values-ja/strings.xml | 14 +- res/values-nb/arrays.xml | 117 -- res/values-nb/strings.xml | 441 ------- res/values-ru/strings.xml | 15 +- res/values/strings.xml | 10 +- src/com/timsu/astrid/activities/TaskList.java | 3 - .../astrid/activities/TaskListAdapter.java | 9 +- .../activities/TaskListSubActivity.java | 21 +- .../astrid/sync/SynchronizationService.java | 192 +-- src/com/timsu/astrid/sync/Synchronizer.java | 6 - .../astrid/utilities/StartupReceiver.java | 3 +- translations/arrays-ca.po | 4 +- translations/arrays-de.po | 4 +- translations/arrays-es.po | 4 +- translations/{arrays-nb.po => arrays-fr.po} | 122 +- translations/arrays-id.po | 278 ----- translations/arrays-ja.po | 4 +- translations/arrays-ru.po | 4 +- translations/arrays.pot | 2 +- translations/strings-ca.po | 462 +++---- translations/strings-de.po | 472 +++---- translations/strings-es.po | 463 +++---- translations/strings-fr.po | 1082 +++++++++++++++++ translations/strings-id.po | 1062 ---------------- translations/strings-ja.po | 461 +++---- translations/strings-nb.po | 1069 ---------------- translations/strings-ru.po | 462 +++---- translations/strings.pot | 14 +- 39 files changed, 3053 insertions(+), 4929 deletions(-) create mode 100644 res/values-fr/arrays.xml create mode 100644 res/values-fr/strings.xml delete mode 100644 res/values-id/arrays.xml delete mode 100644 res/values-id/strings.xml delete mode 100644 res/values-nb/arrays.xml delete mode 100644 res/values-nb/strings.xml rename translations/{arrays-nb.po => arrays-fr.po} (65%) delete mode 100644 translations/arrays-id.po create mode 100644 translations/strings-fr.po delete mode 100644 translations/strings-id.po delete mode 100644 translations/strings-nb.po diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6a98ea783..9cea654fb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionName="2.8.8" android:versionCode="115"> @@ -76,6 +76,8 @@ + + @@ -92,8 +94,6 @@ - - diff --git a/bin/androidxml2po.bash b/bin/androidxml2po.bash index 57589b3c2..e96e7cedf 100755 --- a/bin/androidxml2po.bash +++ b/bin/androidxml2po.bash @@ -26,8 +26,8 @@ if [ ! -e /usr/bin/gettext ]; then fi #Set the languages here (long version is the android resource append string). -short_lang=("ca" "es" "de" "id" "ja" "nb" "ru") #do not include template language ("en" usually). -long_lang=("ca" "es" "de" "id" "ja" "nb" "ru") #do not include template language ("en" usually). +short_lang=("ca" "es" "fr" "de" "ja" "ru") #do not include template language ("en" usually). +long_lang=("ca" "es" "fr" "de" "ja" "ru") #Change the dirs where the files are located. launchpad_po_files_dir="translations" launchpad_pot_file_dir="translations" diff --git a/res/layout/main.xml b/res/layout/main.xml index 0c7f230ac..a6fcde940 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -30,13 +30,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> -