From e859dbaa30ba6c5649adb0e973d81ab942e2993f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 23 Nov 2017 14:14:31 +0100 Subject: [PATCH 1/7] Language rework --- .../app/src/main/res/values/strings.xml | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/CityZenApp/app/src/main/res/values/strings.xml b/CityZenApp/app/src/main/res/values/strings.xml index 0610864..e63f514 100644 --- a/CityZenApp/app/src/main/res/values/strings.xml +++ b/CityZenApp/app/src/main/res/values/strings.xml @@ -1,30 +1,30 @@ CityZen - "Unable to reach the authorization server" + "Could not contact the authorization server" "Loading" "Retry" "Authorization failed: All listed permissions need to be granted" "You are offline" - "You need to login with your OSM user account to apply changes to OpenStreetMap. Authorize now?" + "You need to log in with your OSM user account to apply changes to OpenStreetMap. Authorize now?" "Later" Filter Only currently opened - CityZen needs to have write permissions to provide map services - CityZen must have write permissions to provide map services - CityZen needs to have location to provide map services - CityZen must have location to provide map services + CityZen needs write permissions to provide map services + CityZen needs write permissions to provide map services + CityZen needs location access to provide map services + CityZen needs location access to provide map services Allow Deny - no services found near your location + no services found near you Can\'t find your location. \nEnable GPS to continue - We are figuring out your location. \nPlease wait. + Determining location. \nPlease wait. CityZen - Click on the map to add \n Points of Interest + Click on the map to add \n points of interest Add Cancel - Wifi - Email + Wi-Fi + E-mail address Website Phone Name @@ -48,8 +48,8 @@ Opening Closing Done - No internet access. Connect to internet to continue - Your session has expired. Please login to continue + No Internet access, it is needed to continue + Session expired. Please log in again to continue Internet Access Edit Street @@ -57,9 +57,9 @@ Add closing hours Add opening hours Not a valid website - Not a valid email + Not a valid e-mail address An error occurred - updated successfully + updated Editing is not possible for Point of interest type Select amenity type @@ -67,51 +67,51 @@ Yes No Wired - Wlan - created successfully + WLAN + created Sort by name Add a marker on the map About the project - CityZen is an open source Android app that helps you navigate and explore the city easily. - With CityZen you find points of interest (POIs) such as ATMs, gas stations, drugstores, mobile phone stores and other interesting services near you. The app shows these POIs based on your location of your smartphone, but it does so by respecting your privacy since we don’t keep your navigation data. -The app is open source licensed because we want the project to be empowered by the community for the community. We initiated this project as a way of empowering tools and platforms such as OpenStreetMap that respect our freedoms. If you are an OpenStreetMap contributor you can easily add information to the POIs by editing them inside CityZen. + CityZen is a libre software Android app that helps you navigate and explore the city easily. + Find points of interest (POIs) such as ATMs, gas stations, drugstores, mobile phone stores and other interesting services near you. They are relevant to your position, but privacy is maintained, as navigation data is not kept. +The app is libre software licensed, to empowered by the community, for the community. The project makes use of tools and platforms such as OpenStreetMap that respects user freedom. OpenStreetMap contributors can easily add information to POIs by editing them inside CityZen. www.cityzenapp.co - www.cityzenapp.co/license + https://github.com/CityZenApp/Android-Development/blob/master/LICENSE www.cityzenapp.co/app-privacy-policy ping@cityzenapp.co License Privacy policy Contact - CityZen must have location to provide map services. Do you want to enable location? + CityZen needs location access to provide map services. Do you want to enable it now? OSM routing isn\'t available at this time. Try again later House number Postcode Get involved - www.github.com/CityZenApp + https://www.github.com/CityZenApp Credits www.cityzenapp.co/credits - CityZen app was initiated in Albania with a lot of ♥\n for free and open source culture. + CityZen app was initiated in Albania with ♥\n for free software and its culture. - Cafes - Bars/Clubs + Cafés + Bars/clubs Restaurants Fast food Tourism - Hotels/Hostels + Hotels/hostels Transportation Gas stations - Pharmacy/Healthcare - Banks/ATMs/Exchange - Mobile phone store - Markets/Kiosks - Shopping Malls - Parkings - Rent a bicycle + Pharmacy/healthcare + Banks/ATMs/exchanges + Mobile phone stores + Markets/kiosks + Shopping malls + Parking + Bicycle rental Rent a car & Care sharing Logged in as: - Login to OSM - LogOut + Log in to OSM + Log out From aea8d0f1969d2b0cbaa0ad716a12fa409d4d708e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 23 Nov 2017 14:21:31 +0100 Subject: [PATCH 2/7] OSM user account, log in --- CityZenApp/app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CityZenApp/app/src/main/res/values/strings.xml b/CityZenApp/app/src/main/res/values/strings.xml index e63f514..13bc4c1 100644 --- a/CityZenApp/app/src/main/res/values/strings.xml +++ b/CityZenApp/app/src/main/res/values/strings.xml @@ -5,7 +5,7 @@ "Retry" "Authorization failed: All listed permissions need to be granted" "You are offline" - "You need to log in with your OSM user account to apply changes to OpenStreetMap. Authorize now?" + "An OSM user account in needed to make changes in OpenStreetMap. Log in now?" "Later" Filter Only currently opened From 133c5bf2e8efe7cfbe2c44efa015278b9a14ac8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 23 Nov 2017 14:34:57 +0100 Subject: [PATCH 3/7] Shortened explanation --- CityZenApp/app/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CityZenApp/app/src/main/res/values/strings.xml b/CityZenApp/app/src/main/res/values/strings.xml index 13bc4c1..76d9be6 100644 --- a/CityZenApp/app/src/main/res/values/strings.xml +++ b/CityZenApp/app/src/main/res/values/strings.xml @@ -72,9 +72,9 @@ Sort by name Add a marker on the map About the project - CityZen is a libre software Android app that helps you navigate and explore the city easily. - Find points of interest (POIs) such as ATMs, gas stations, drugstores, mobile phone stores and other interesting services near you. They are relevant to your position, but privacy is maintained, as navigation data is not kept. -The app is libre software licensed, to empowered by the community, for the community. The project makes use of tools and platforms such as OpenStreetMap that respects user freedom. OpenStreetMap contributors can easily add information to POIs by editing them inside CityZen. + A libre software Android app that helping you navigate and explore the city. + Find points of interest, and other interesting services near you. They are relevant to your position, but privacy is maintained, as navigation data is not kept. +The libre software licensing empowers community, by and for the community, and the project makes use of tools and platforms that respects user freedom, such as OpenStreetMap. If you have an account there, you can add information to POIs by editing them inside CityZen. www.cityzenapp.co https://github.com/CityZenApp/Android-Development/blob/master/LICENSE www.cityzenapp.co/app-privacy-policy From 2b32491a0d935b653d7bb36d60094389295652f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 1 Dec 2017 19:12:13 +0100 Subject: [PATCH 4/7] amenities/POI titles updated --- .../PoiCategoryFilter/FilterCategory.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java b/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java index 96efa00..c5c2115 100644 --- a/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java +++ b/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java @@ -11,22 +11,22 @@ public class FilterCategory { /** * * - * Cafes - * Bars/Clubs + * Cafés + * Bars & clubs * Restaurants * Fast food - * Tourist attractions - * Hotels/Hostels - * Public transport + * Tourism + * Accommodation + * Transportation * Gas stations - * Drugstores\nHealthcare centers - * Banks/ATMs - * Mobile phone store - * Super Markets - * Shopping Malls - * Parkings + * Pharmacies & healthcare + * Banks & ATMs + * Mobile phone stores + * Markets & kiosks + * Shopping malls + * Parking * Rent a bicycle - * Rent a car & Care sharing + * Car rental & sharing * *

* From c95a35027139bc5fd9fc5a41d8e2fa8173c87135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 1 Dec 2017 19:15:36 +0100 Subject: [PATCH 5/7] =?UTF-8?q?@string/Parkings=20=E2=86=92?= =?UTF-8?q?=20Parking?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CityZenApp/app/src/main/res/values/arrays.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CityZenApp/app/src/main/res/values/arrays.xml b/CityZenApp/app/src/main/res/values/arrays.xml index ec34def..53e5ce2 100644 --- a/CityZenApp/app/src/main/res/values/arrays.xml +++ b/CityZenApp/app/src/main/res/values/arrays.xml @@ -17,7 +17,7 @@ @string/MobilePhoneStore @string/Markets_Kiosks @string/Shopping_Malls - @string/Parkings + @string/Parking @string/RentBicycle @string/RentCar_CareSharing @@ -79,4 +79,4 @@ #ea13ec2c #BB89FF - \ No newline at end of file + From 6e503650495762c9a2d7d7cf058cd892a5475739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 1 Dec 2017 19:24:55 +0100 Subject: [PATCH 6/7] =?UTF-8?q?POIs=20and=20Access=20=E2=86=92=20access?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CityZenApp/app/src/main/res/values/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CityZenApp/app/src/main/res/values/strings.xml b/CityZenApp/app/src/main/res/values/strings.xml index 76d9be6..b61ed76 100644 --- a/CityZenApp/app/src/main/res/values/strings.xml +++ b/CityZenApp/app/src/main/res/values/strings.xml @@ -50,7 +50,7 @@ Done No Internet access, it is needed to continue Session expired. Please log in again to continue - Internet Access + Internet access Edit Street City @@ -95,21 +95,21 @@ The libre software licensing empowers community, by and for the community, and t Cafés - Bars/clubs + Bars & clubs Restaurants Fast food Tourism - Hotels/hostels + Accommodation Transportation Gas stations - Pharmacy/healthcare - Banks/ATMs/exchanges + Pharmacies & healthcare + Financial services Mobile phone stores - Markets/kiosks + Markets & kiosks Shopping malls Parking Bicycle rental - Rent a car & Care sharing + Car rental & sharing Logged in as: Log in to OSM From dc3145a162c9c689e65d9290bb465e60121b8f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 1 Dec 2017 19:25:58 +0100 Subject: [PATCH 7/7] Financial services and Bicycle rental --- .../Utils/MapUtils/PoiCategoryFilter/FilterCategory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java b/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java index c5c2115..32d130c 100644 --- a/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java +++ b/CityZenApp/app/src/main/java/com/cityzen/cityzen/Utils/MapUtils/PoiCategoryFilter/FilterCategory.java @@ -20,12 +20,12 @@ public class FilterCategory { * Transportation * Gas stations * Pharmacies & healthcare - * Banks & ATMs + * Financial services * Mobile phone stores * Markets & kiosks * Shopping malls * Parking - * Rent a bicycle + * Bicycle rental * Car rental & sharing * *