From 560f638e709be878599ec8a0fc86c3cee98e56b8 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sat, 6 Dec 2014 05:35:34 +0100 Subject: [PATCH 01/12] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1570 of 1570 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index e5b2d51ae8..c965b813ec 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1831,7 +1831,7 @@ 永不 進階 使用安全協定連線於伺服器 - 使用 https + 使用 HTTPS 地圖 查尋 顯示地圖 @@ -1841,6 +1841,7 @@ 找不到最近的路 一切都為最新的 使用 OpenGL 繪製 - 使用硬體加速 OpenGL 繪製（可能在某些裝置無法工作） + 使用硬體加速 OpenGL 繪製（可能在某些裝置上無法工作） 排除 + 不能下載。請連接到 Wifi 網路進行。 From 256e3f61935543151dafb9441dcc4725010da386 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 09:04:09 +0100 Subject: [PATCH 02/12] 2 small typos --- OsmAnd/res/values/no_translate.xml | 2 +- OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml index 6bea8477b3..f2118341a8 100644 --- a/OsmAnd/res/values/no_translate.xml +++ b/OsmAnd/res/values/no_translate.xml @@ -16,7 +16,7 @@ +play_market +gps_status -parking_plugin -blackberry -free_version -amazon © OpenStreetMap - Data is powered by OpenStreetMaps ODbL + Data is powered by OpenStreetMap ODbL \n\nAll rights belong to OsmAnd app. diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java index dfb570e6f9..9a9cc13640 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java @@ -202,7 +202,7 @@ public class DashboardActivity extends BaseDownloadActivity { PackageManager pm = activity.getPackageManager(); ApplicationInfo appInfo = pm.getApplicationInfo(OsmandApplication.class.getPackage().getName(), 0); Date date = new Date(new File(appInfo.sourceDir).lastModified()); - edition = activity.getString(R.string.local_index_installed) + " :\t" + DateFormat.getDateFormat(app).format(date); + edition = activity.getString(R.string.local_index_installed) + " : \t" + DateFormat.getDateFormat(app).format(date); } catch (Exception e) { } SpannableString content = new SpannableString(vt + version +"\n" + From 5b4c5e00b1daa4ebe24e705d015c4243e5e2e185 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 09:08:24 +0100 Subject: [PATCH 03/12] Link to OSM copyright --- OsmAnd/res/values/no_translate.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml index f2118341a8..d68275a8e1 100644 --- a/OsmAnd/res/values/no_translate.xml +++ b/OsmAnd/res/values/no_translate.xml @@ -16,7 +16,7 @@ +play_market +gps_status -parking_plugin -blackberry -free_version -amazon © OpenStreetMap - Data is powered by OpenStreetMap ODbL + Data is powered by OpenStreetMap ODbL, © OpenStreetMap \n\nAll rights belong to OsmAnd app. From f6d69ce8082186a195ee2e49e05cfa589f68ec1a Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 09:12:04 +0100 Subject: [PATCH 04/12] Move copyright notes and links to About screen --- OsmAnd/res/layout/dashboard.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml index 00055f5a26..67384939e5 100644 --- a/OsmAnd/res/layout/dashboard.xml +++ b/OsmAnd/res/layout/dashboard.xml @@ -38,6 +38,7 @@ android:textSize="20sp" /> + From 1f5d846c1fdb7a709442a1a60f7cd90939ffa07d Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 09:30:53 +0100 Subject: [PATCH 05/12] Hide copyright notes from dashboard, should be removed later --- OsmAnd/res/layout/dashboard.xml | 6 +++--- .../src/net/osmand/plus/activities/DashboardActivity.java | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml index 67384939e5..85845cc77d 100644 --- a/OsmAnd/res/layout/dashboard.xml +++ b/OsmAnd/res/layout/dashboard.xml @@ -38,7 +38,7 @@ android:textSize="20sp" /> - - + + diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java index 9a9cc13640..92061d1fea 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java @@ -119,6 +119,10 @@ public class DashboardActivity extends BaseDownloadActivity { final String textVersion = "\u00A9 OsmAnd " + inst.get(Calendar.YEAR); textVersionView.setText(textVersion); final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE); + + //TODO: textversionview should be totally removed here as it has been moved to the About screen + textVersionView.setVisibility(View.GONE); + textVersionView.setOnClickListener(new OnClickListener(){ int i = 0; From 655d0747ad265fafb8b843f9fbc3cc8f1e892757 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 09:42:57 +0100 Subject: [PATCH 06/12] unify comments --- OsmAnd/res/layout/dashboard.xml | 2 +- OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml index 85845cc77d..195329b8ed 100644 --- a/OsmAnd/res/layout/dashboard.xml +++ b/OsmAnd/res/layout/dashboard.xml @@ -38,7 +38,7 @@ android:textSize="20sp" /> - + Date: Sat, 6 Dec 2014 10:06:16 +0100 Subject: [PATCH 07/12] make link clickable --- OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java index 062c48baa8..fe7cc2b8b6 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java @@ -221,6 +221,7 @@ public class DashboardActivity extends BaseDownloadActivity { }, st, st + version.length(), 0); tv.setText(content); + tv.setMovementMethod(LinkMovementMethod.getInstance()); } else { tv.setText(vt + version +"\n\n" + activity.getString(R.string.about_content)); From 393809bdc544975bcf496a1b4745194cfe01e94f Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Sat, 6 Dec 2014 10:15:03 +0100 Subject: [PATCH 08/12] Translated using Weblate (Italian) Currently translated at 100.0% (1570 of 1570 strings) --- OsmAnd/res/values-it/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 1f6e19a234..457108d434 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2038,4 +2038,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Utilizzare il rendering opengl accelerato via hardware (potrebbe non funzionare in alcuni dispositivi) Tutto aggiornato Abbandona + Non è possibile scaricare. Prego, connettersi al Wi-Fi per procedere. From a7ebe5b0679bc8dba483a349c324f700412cba3e Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 10:41:54 +0100 Subject: [PATCH 09/12] try using explicit link --- OsmAnd/res/values/no_translate.xml | 2 +- OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml index d68275a8e1..334b426c8f 100644 --- a/OsmAnd/res/values/no_translate.xml +++ b/OsmAnd/res/values/no_translate.xml @@ -16,7 +16,7 @@ +play_market +gps_status -parking_plugin -blackberry -free_version -amazon © OpenStreetMap - Data is powered by OpenStreetMap ODbL, © OpenStreetMap + Data is powered by OpenStreetMap ODbL, © http://www.openstreetmap.org/copyright \n\nAll rights belong to OsmAnd app. diff --git a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java index fe7cc2b8b6..062c48baa8 100644 --- a/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/DashboardActivity.java @@ -221,7 +221,6 @@ public class DashboardActivity extends BaseDownloadActivity { }, st, st + version.length(), 0); tv.setText(content); - tv.setMovementMethod(LinkMovementMethod.getInstance()); } else { tv.setText(vt + version +"\n\n" + activity.getString(R.string.about_content)); From df46b01dcdf32c9514f66357202cbb3ba751f15e Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 11:04:03 +0100 Subject: [PATCH 10/12] comment out code related to creating copyright notes directly on dashboard --- OsmAnd/res/layout/dashboard.xml | 4 +- .../plus/activities/DashboardActivity.java | 68 +++++++++---------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml index 195329b8ed..c301d04e32 100644 --- a/OsmAnd/res/layout/dashboard.xml +++ b/OsmAnd/res/layout/dashboard.xml @@ -38,7 +38,7 @@ android:textSize="20sp" /> - + +--> From d8bea356e56cd18e893e1e1f15e63841b5f5ec17 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 6 Dec 2014 11:30:37 +0100 Subject: [PATCH 12/12] slightly re-group copyright srings --- OsmAnd/res/values/no_translate.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml index 334b426c8f..6f5947e1b3 100644 --- a/OsmAnd/res/values/no_translate.xml +++ b/OsmAnd/res/values/no_translate.xml @@ -16,11 +16,10 @@ +play_market +gps_status -parking_plugin -blackberry -free_version -amazon © OpenStreetMap - Data is powered by OpenStreetMap ODbL, © http://www.openstreetmap.org/copyright + Data is powered by OpenStreetMap ODbL, © http://www.openstreetmap.org/copyright. - \n\nAll rights belong to OsmAnd app. + \n\nAll rights belong to OsmAnd app, Copyright © 2010-2014 OsmAnd. - \n\nCopyright © 2010-2014 OsmAnd \n\nCredits to all major Contributors/Developers : \n\tVictor Shcherb - project lead. \n\tDr. Hardy Mueller - map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.