diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 617ee8e2be..273f541b46 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -275,6 +275,17 @@ android:label="@string/settings" android:parentActivityName="com.mapswithme.maps.MwmActivity" /> + + + + + + + + + + + diff --git a/android/res/drawable/ic_menu_report.xml b/android/res/drawable/ic_menu_report.xml deleted file mode 100644 index 8b8154dd22..0000000000 --- a/android/res/drawable/ic_menu_report.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/res/drawable/ic_question_mark.xml b/android/res/drawable/ic_question_mark.xml new file mode 100755 index 0000000000..e8cfd61520 --- /dev/null +++ b/android/res/drawable/ic_question_mark.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/res/drawable/ic_rate.xml b/android/res/drawable/ic_rate.xml new file mode 100644 index 0000000000..d18c527ea1 --- /dev/null +++ b/android/res/drawable/ic_rate.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/res/drawable/ic_report_a_bug.xml b/android/res/drawable/ic_report_a_bug.xml new file mode 100755 index 0000000000..5d25da26c9 --- /dev/null +++ b/android/res/drawable/ic_report_a_bug.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml index 8e275e342f..4fb9e914ee 100644 --- a/android/res/layout/about.xml +++ b/android/res/layout/about.xml @@ -11,40 +11,83 @@ - - + - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/res/layout/fragment_prefs_help.xml b/android/res/layout/fragment_prefs_faq.xml similarity index 100% rename from android/res/layout/fragment_prefs_help.xml rename to android/res/layout/fragment_prefs_faq.xml diff --git a/android/res/layout/help_activity.xml b/android/res/layout/help_activity.xml new file mode 100644 index 0000000000..dd06f2e1d5 --- /dev/null +++ b/android/res/layout/help_activity.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/android/res/layout/menu_buttons_line.xml b/android/res/layout/menu_buttons_line.xml index 9683bc0991..bd8e1bd722 100644 --- a/android/res/layout/menu_buttons_line.xml +++ b/android/res/layout/menu_buttons_line.xml @@ -11,9 +11,9 @@ android:orientation="horizontal"> - تقييم التطبيق مساعدة - + + ﺔﺑﻮﺟﺃﻭ ﺔﻠﺌﺳﺃ + + كيف تدعم لنا؟ + حقوق الطبع والنشر - + الإبلاغ عن خطأ لم يتم تعيين البريد الإلكتروني للعميل. يرجى تكوينه أو استخدام أي وسيلة أخرى للاتصال بنا على %s @@ -560,14 +564,8 @@ انظر يستخدم Organic Maps موقعك الجغرافي في الخلفية لتسجيل مسار سفرك الأخير. - - تصنيف على Google Play - - أخبر صديق - - مرحبًا! تثبيت Organic Maps! - - Organic Maps هو تطبيق أساسي للسفر بدون اتصال بالإنترنت. يعتمد برنامج Organic Maps على بيانات OpenStreetMap ويتيح تحريرها. + + Organic Maps هو تطبيق مجاني. تم تطويره من قبل عدد قليل من المهندسين في وقت فراغنا. جميع بيانات الخريطة من OpenStreetMap. لا اعلانات. لا تتبع. لم يتم جمع بياناتك الشخصية. إعدادات عامة قبول diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 13a907f6d0..e8883ee809 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -230,9 +230,13 @@ Ацаніць дадатак Дапамога - + + Пытанні і адказы + + Як нас падтрымаць? + Капірайт - + Паведаміць аб памылцы Паштовы кліент не наладжаны. Наладзьце яго альбо звяжыцеся з намі па адрасе %s іншым чынам. @@ -570,14 +574,8 @@ Паглядзі Organic Maps ужывае вашу геалакацыю ў фонавым рэжыме каб запісваць ваш нядаўна пройдзены маршрут. - - Ацаніць на Google Play - - Рассказаць сябрам - - Прывітанне! Усталюй Organic Maps! - - Organic Maps — неабходны дататак для падарожжаў, каторы працуе без падлучэння да інтэрнэту. Organic Maps ужывае дадзеныя OpenStreetMap і дазваляе іх правіць. + + Organic Maps гэта бясплатнае прыкладанне. Ён распрацаваны некалькіх інжынераў у вольны час. Усе дадзеныя карты з OpenstreetMap. Няма аб\'яваў. Няма адсочвання. Вашы асабістыя дадзеныя не збіраюцца. Агульныя налады Прыняць diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 1cce21442b..e89be107c6 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -220,9 +220,13 @@ Ohodnotit aplikaci Nápověda - + + Otázky a odpovědi + + Jak nás podpořit? + Autorská práva - + Nahlásit chybu Emailový klient nebyl ještě nakonfigurován. Nastavte ho, prosím, nebo použijte jiný způsob k našemu kontaktování na %s @@ -558,14 +562,8 @@ Odjezd Organic Maps používají geopozici na pozadí, aby se zaznamenala vaše nedávno ujetá trasa. - - Ohodnotit na Google Play - - Sdílet s přáteli - - Ahoj! Naisntalujte si Organic Maps! - - Organic Maps je základní aplikace pro každého cestovatele. Organic Maps je založena na datech z OpenStreetMap a umožňuje je upravovat. + + Organic Maps je bezplatná aplikace. Vyvíjejí se několik inženýrů v našem volném čase. Všechna mapová data jsou z OpenStreetMap. Žádné reklamy. Žádné sledování. Vaše osobní údaje nejsou shromažďovány. Obecná nastavení Přijmout diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index ed3247276f..fdb7a9dbd4 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -220,9 +220,13 @@ Bedøm appen Hjælp - + + Spørgsmål og svar + + Sådan støtter vi os? + Copyright - + Rapportér fejl Emailklienten er ikke blevet sat op. Venligst konfigurér den eller brug en anden måde til at kontakte os på %s @@ -558,14 +562,8 @@ Tjek Organic Maps anvender din geoposition i baggrunden til at gemme din seneste rejserute. - - Bedøm på Google Play - - Sig det videre til en ven - - Hej! Installer Organic Maps! - - Organic Maps er en essentiel offline-app for rejsende. Organic Maps er baseret på data fra OpenStreetMap, og gør det muligt at redigere disse data. + + Organic Maps er en gratis applikation. Det er udviklet af et par ingeniører i vores fritid. Alle kortdata er fra OpenSTreetMap. Ingen annoncer. Ingen sporing. Dine personlige data indsamles ikke. Generelle indstillinger Accepter diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 3f1906cab1..5919d9e9a5 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -228,9 +228,13 @@ Bewerten Sie die App Hilfe - + + Fragen und Antworten + + Wie unterstützen Sie uns? + Copyright - + Fehler melden Der Email-Client ist noch nicht eingerichtet worden. Konfigurieren Sie ihn bitte oder nutzen Sie eine andere Möglichkeit, uns unter %s zu erreichen. @@ -566,14 +570,8 @@ Nachsehen Organic Maps verwendet Ihre Geoposition im Hintergrund, um Ihre kürzlich gefahrene Route aufzunehmen. - - Bei Google Play bewerten - - Einem Freund empfehlen - - Hallo! Installiere dir Organic Maps! - - Organic Maps ist eine wichtige Offline-App zum Reisen. Organic Maps basiert auf OpenStreetMap-Daten und ermöglicht das Bearbeiten dieser. + + Organic Maps ist eine kostenlose Anwendung. Es wird von einigen Ingenieuren in unserer Freizeit entwickelt. Alle Kartendaten stammen aus OpenStreetMap. Keine Werbung. Keine Verfolgung. Ihre persönlichen Daten werden nicht gesammelt. Allgemeine Einstellungen Annehmen diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index 9104cee163..5c20cb5dc2 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -222,9 +222,13 @@ Βαθμολογήστε την εφαρμογή Βοήθεια - + + Ερωτήσεις και απαντήσεις + + Πώς να μας υποστηρίξετε; + Πνευματικά δικαιώματα - + Αναφορά σφάλματος Το πρόγραμμα-client ηλεκτρονικού ταχυδρομείου έχει δεν έχει ρυθμιστεί. Ρυθμίστε το ή χρησιμοποιήστε άλλο τρόπο να επικοινωνήσετε μαζί μας στη διεύθυνση %s @@ -548,14 +552,8 @@ Αναχώρηση Το Organic Maps χρησιμοποιεί τη γεωγραφική σας τοποθεσία στο παρασκήνιο για την καταγραφή των πρόσφατων διαδρομών σας. - - Βαθμολογήστε το στο Google Play - - Πείτε το σε ένα φίλο - - Γεια σας! Εγκαταστήστε το Organic Maps! - - Το Organic Maps είναι η απαραίτητη εφαρμογή γα ταξίδια που λειτουργεί εκτός σύνδεσης. Το Organic Maps βασίζεται σε δεδομένα OpenStreetMap και σας επιτρέπει να τα επεξεργαστείτε. + + Ο Organic Maps είναι μια δωρεάν εφαρμογή. Αναπτύσσεται από λίγους μηχανικούς στον ελεύθερο χρόνο μας. Όλα τα δεδομένα χάρτη είναι από το OpenStreetMap. Χωρίς διαφημίσεις. Χωρίς εντοπισμό. Τα προσωπικά σας δεδομένα δεν συλλέγονται. Γενικές ρυθμίσεις Συμφωνώ diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 28983563a8..1f21ea0672 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -218,9 +218,13 @@ Valora la aplicación Ayuda - + + Preguntas y respuestas + + ¿Cómo apoyarnos? + Copyright - + Hay un error No se ha configurado el cliente de correo electrónico. Por favor, configúralo o utiliza alguna otra forma de ponerte en contacto con nosotros en %s @@ -556,14 +560,8 @@ Comprueba Organic Maps usa tu geolocalización en segundo plano para registrar tu ruta recorrida recientemente. - - Valorar en Google Play - - Enviar a un amigo - - ¡Hola! ¡Instala Organic Maps! - - Organic Maps es una aplicación esencial offline para viajar. Organic Maps se basa en datos de OpenStreetMap y permite editarla. + + Organic Maps es una aplicación gratuita. Es desarrollado por unos pocos ingenieros en nuestro tiempo libre. Todos los datos de mapas son de OpenStreetMap. Sin anuncios. Sin seguimiento. Sus datos personales no se recopilan. Ajustes generales Aceptar diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml index edd7736849..254eca40d6 100644 --- a/android/res/values-fa/strings.xml +++ b/android/res/values-fa/strings.xml @@ -214,9 +214,13 @@ امتیاز به این اپلیکیشن کمک - + + ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ + + چگونه از ما حمایت کنیم؟ + حق نشر و کپی رایت - + گزارش خطا کلاینت ایمیل شما پیکربندی نشده است.لطفا ان را پیکربندی کنید یا از طریق دیگر با ما تماس بگیرید %s @@ -546,14 +550,8 @@ بررسی کنید Organic Maps از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر هایی که اخیرا سفر کرده اید استفاده می کند. - - امتیاز دادن در گوگل پلی - - به یک دوست بگویید - - سلام! Organic Maps را نصب کنید. - - Organic Maps یک نرم افزار افلاین مخصوص سفر است. Organic Maps بر پایه دیتای OpenStreetMap است و به شما اجازه ویرایش در ان را می دهد. + + Organic Maps یک برنامه رایگان است. این توسط چند مهندس در زمان آزاد ما توسعه یافته است. تمام داده های نقشه از OpenStreetMap است. بدون تبلیغاتبدون ردیابیاطلاعات شخصی شما جمع آوری نشده است. تنظیمات عمومی موافقم diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index db3e31e537..57bafb67f6 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -222,9 +222,13 @@ Arvioi sovellus Ohje - + + Kysymykset ja vastaukset + + Kuinka tukea meitä? + Copyright - + Ilmoita virheestä Sähköpostisovellusta ei ole asetettu. Ole hyvä ja määritä sähköpostiasetukset tai ota meihin yhteyttä toista kautta osoitteessa %s @@ -560,14 +564,8 @@ Tarkastele MAPS.SE käyttää taustalla geosijaintia sinun viimeisen matkareitin tallentamiseksi. - - Arvioi Google Playssa - - Kerro kaverille - - Hei, asenna Organic Maps! - - Organic Maps on ehdoton offline-sovellus matkoja varten. Organic Maps perustuu OpenStreetMap-dataan ja sallii sen muokkauksen. + + Organic Maps on ilmainen sovellus. Se kehittää muutamia insinöörejä vapaa-ajalla. Kaikki karttatiedot ovat OpenStreetMapista. Ei mainoksia. Ei seurantaa. Henkilötietojasi ei kerätä. Yleiset asetukset Hyväksy diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index d63a76ba23..5ca20f58e4 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -228,9 +228,13 @@ Évaluer l\'appli Aide - + + Questions et réponses + + Comment nous soutenir? + Tous droits réservés - + Signaler un bug Le client de courriel n\'a pas été configuré. Veuillez le faire ou employer tout autre moyen pour nous contacter à %s @@ -568,14 +572,8 @@ Consultez Organic Maps utilise votre géolocalisation en arrière-plan pour enregistrer vos itinéraires récents. - - Noter sur Google Play - - Recommander à un ami - - Salut! Installe Organic Maps! - - Organic Maps est une application hors ligne essentielle pour les voyages. Organic Maps se base sur les données OpenStreetMap et permet de les modifier. + + Organic Maps est une application gratuite. Il est développé par quelques ingénieurs dans notre temps libre. Toutes les données cartographiques proviennent de OpenStreetMap. Pas de pubs. Pas de localisation. Vos données personnelles ne sont pas collectées. Paramètres généraux Accepter diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index ef81c25f09..baf104bf7b 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -220,9 +220,13 @@ Értékeld az alkalmazást Segítség - + + Kérdések és válaszok + + Hogyan támogat minket? + Szerzői jog - + Hibabejelentés Az email kliens nincs beállítva. Kérjük, konfiguráld vagy próbálj meg valamilyen más módon kapcsolatba lépni velünk a %s email címen keresztül. @@ -557,14 +561,8 @@ Tekintse meg A Organic Maps a geopozíciód használatával a háttérben rögzíti a legutóbb megtett utad. - - Arány a Google Play-n - - Mondja el egy ismerősének - - Szia! Telepítsd a Organic Maps alkalmazást! - - A Organic Maps egy nélkülözhetetlen alkalmazás utazáshoz. A Organic Maps az OpenStreetMap adataira épül, és lehetővé teszi ezek szerkesztését. + + Az Organic Maps ingyenes alkalmazás. A szabadidőben néhány mérnök fejlett. Az összes térképadat az OpenStreetMapból származik. Nincsenek hirdetések. Nincs nyomkövetés. Az Ön személyes adatait nem gyűjtik össze. Általános beállítások Elfogadja diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index ee939970f2..b46df28e69 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -222,9 +222,13 @@ Beri nilai aplikasi Bantuan - + + Pertanyaan dan jawaban + + Bagaimana cara mendukung kami? + Hak cipta - + Laporkan gangguan Surel pelanggan belum diatur. Mohon konfigurasikan atau gunakan cara lain untuk menghubungi kami di %s @@ -560,14 +564,8 @@ Lihat Organic Maps menggunakan geoposisi di latar belakang untuk merekam rute yang baru Anda lalui. - - Beri nilai di Google Play - - Beri Tahu Teman - - Hai! Instal Organic Maps yuk! - - Organic Maps adalah aplikasi offline yang sangat berguna untuk bepergian. Organic Maps didasarkan pada data OpenStreetMap dan memungkinkan kita untuk mengeditnya. + + Organic Maps adalah aplikasi gratis. Ini dikembangkan oleh beberapa insinyur di waktu luang kami. Semua data peta berasal dari openstreetmap. Tanpa iklan. Tidak ada pelacakan. Data pribadi Anda tidak dikumpulkan. Setelan umum Terima diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index c15d6d5fd1..fdd3de7f9c 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -218,9 +218,13 @@ Vota l\'app Aiuto - + + Domande e risposte + + Come supportarci? + Copyright - + Riporta un bug Il client email non è stato configurato. Si prega di configurarlo o di usare qualsiasi altro metodo per contattarci all\'indirizzo %s @@ -556,14 +560,8 @@ Dai uno sguardo Organic Maps usa la tua posizione geografica in background per registrare il tuo percorso effettuato più di recente. - - Vota su Google Play - - Dillo a un amico - - Ciao! Installa Organic Maps! - - Organic Maps è un\'applicazione offline essenziale per chi ama viaggiare. Organic Maps si basa sui dati OpenStreetMap e consente di apportare modifiche. + + Organic Maps è un\'applicazione gratuita. È sviluppato da alcuni ingegneri nel nostro tempo libero. Tutti i dati della mappa provengono da OpenStreetMap. Nessuna pubblicità. No tracciabilità. I tuoi dati personali non sono raccolti. Impostazioni generali Accetta diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 649a10bc89..3160550c6d 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -218,9 +218,13 @@ アプリを評価 ヘルプ - + + 質問と回答 + + どのように私たちを支持する方法？ + 著作権 - + バグを報告 このメールクライアントはセットアップされていません。設定するか、他の方法で%sにご連絡ください。 @@ -556,14 +560,8 @@ ご覧ください Organic Mapsは、あなたの位置情報をバックグラウンドで使用して最近の走行ルートを記録します。 - - Google Play で評価 - - 友達に教える - - こんにちは！Organic Maps をインストールしましょう！ - - Organic Maps は旅に必要不可欠なオフラインアプリケーションです。Organic Maps は OpenStreetMap データに基づいており、データを編集することができます。 + + Organic Mapsは無料のアプリケーションです。それは私たちの自由な時間にいくつかのエンジニアによって開発されています。すべての地図データはOpenStreetMapからのものです。広告なし。全く追跡しません。あなたの個人データは収集されません。 一般設定 了解 diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index df48aca6d2..7deb74b82c 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -220,9 +220,13 @@ 앱 평가 도움말 - + + 질문과 답변 + + 우리를 지원하는 방법? + 저작권 - + 오류 신고 이메일 클라이언트가 설정되지 않았습니다. 이를 구성하거나 %s로 연락할 다른 방법을 사용하십시오. @@ -558,14 +562,8 @@ 체크아웃 Organic Maps는 최근 여행한 경로를 녹음하기 위해 배경 화면에서 지역 위치 서비스를 사용합니다. - - Google Play에서 평가 - - 친구에게 알려주기 - - 안녕하세요! Organic Maps를 설치하세요! - - Organic Maps는 여행용 필수 오프라인 응용 프로그램입니다. Organic Maps는 OpenStreetMap 데이터를 기반으로 하며 이 데이터 편집을 허용합니다. + + Organic Maps는 무료 응용 프로그램입니다. 그것은 자유 시간에 몇 명의 엔지니어가 개발했습니다. 모든지도 데이터는 OpenStreetMap에서입니다. 광고 없음. 추적 없음. 귀하의 개인 데이터는 수집되지 않습니다. 일반 설정 동의 diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 43398ee4cf..b2554f9afc 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -222,9 +222,13 @@ Ranger appen Hjelp - + + Spørsmål og svar + + Hvordan støtte oss? + Opphavsrett - + Rapporter en feil E-postklienten har ikke blitt konfigurert. Konfigurer den eller bruk en annen måte å kontakte oss på %s @@ -558,14 +562,8 @@ Sjekk ut Organic Maps bruker geografiske funksjoner i bakgrunnen for å registrere din nylig reiste rute. - - Gi vurdering på Google Play - - Fortell en venn - - Hei! Installer Organic Maps! - - Organic Maps er en offline app for reising. Organic Maps bygger på OpenStreetMap-data og tillater redigering av den. + + Organic Maps er en gratis applikasjon. Den er utviklet av noen ingeniører på fritiden. Alle kartdata er fra OpenStreetMap. Ingen annonser. Ingen sporing. Dine personopplysninger er ikke samlet. Generelle innstillinger Godta diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index c2e36de96a..5441c5831d 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -224,9 +224,13 @@ App beoordelen Hulp - + + Vragen en antwoorden + + Hoe ons te steunen? + Auteursrechten - + Meld een fout De emailcliënt is niet ingesteld. Gelieve de cliënt te configureren of op een andere manier contact met ons op te nemen op %s @@ -562,14 +566,8 @@ Bekijk Organic Maps gebruikt uw geografische positie op de achtergrond om uw onlangs afgelegde route vast te leggen. - - Beoordeel op Google Play - - Vertel een Vriend - - Hallo! Installeer Organic Maps! - - Organic Maps is een essentiële offline applicatie om te reizen. Organic Maps is gebaseerd op OpenStreetMap gegevens en laat bewerking toe. + + Organic Maps is een gratis applicatie. Het is ontwikkeld door een paar ingenieurs in onze vrije tijd. Alle kaartgegevens zijn van OpenStreetMap. Geen advertenties. Geen volgen. Uw persoonlijke gegevens worden niet verzameld. Algemene instellingen Aanvaarden diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index eace651bdf..543257bfd2 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -227,9 +227,13 @@ Oceń aplikację Pomoc - + + Pytania i odpowiedzi + + Jak nas wspierać? + Prawa autorskie - + Zgłoś błąd Email klienta nie został założony. Proszę skonfigurować adres email, bądź skorzystać z innych opcji, aby się z nami skontaktować na %s @@ -570,14 +574,8 @@ Sprawdź Organic Maps używa w tle geolokalizacji w celu rejestrowania niedawno przebytej trasy. - - Oceń w Google Play - - Powiadom znajomego - - Cześć! Zainstaluj Organic Maps! - - Organic Maps to niezbędna aplikacja do podróży działająca w trybie offline. Organic Maps opiera się o dane OpenStreetMap oraz umożliwia ich edycję. + + Organic Maps to darmowa aplikacja. Jest rozwijany przez kilku inżynierów w naszym wolnym czasie. Wszystkie dane mapowe pochodzą z OpenStreetMap. Bez reklam. Bez śledzenia. Twoje dane osobowe nie są gromadzone. Ustawienia ogólne Zaakceptuj diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml index 0ffeadb438..2ba1450306 100644 --- a/android/res/values-pt-rBR/strings.xml +++ b/android/res/values-pt-rBR/strings.xml @@ -227,9 +227,11 @@ Avaliar o aplicativo Ajuda - + + Perguntas e respostas + Direitos autorais - + Relatar um problema O cliente de email não está configurado. Por favor, configure-o ou utilize qualquer outro modo para nos contatar através de %s @@ -566,14 +568,6 @@ Procure O Organic Maps usa sua localização geográfica em segundo plano para registrar sua rota recente. - - Avaliar em Google Play - - Indique a um amigo - - Olá! Instale o Organic Maps! - - O Organic Maps é um aplicativo offline essencial para viajar. O Organic Maps se baseia nos dados do OpenStreetMap e permite editá-los. Definições gerais Aceitar diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 6a766421da..346ca3760f 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -227,9 +227,13 @@ Avaliar a aplicação Ajuda - + + Perguntas e respostas + + Como nos apoiar? + Direitos de autor - + Reportar um problema O programa de email não está configurado. Por favor, configure-o ou utilize qualquer outra forma de nos contactar através de %s @@ -567,14 +571,8 @@ Verificar O Organic Maps usa a sua localização geográfica em segundo plano para gravar a sua rota recente. - - Avaliar no Google Play - - Indique a um amigo - - Olá! Instale o Organic Maps! - - O Organic Maps é uma aplicação offline essencial para viajar. O Organic Maps baseia-se nos dados do OpenStreetMap e permite editá-los. + + Organic Maps é um aplicativo gratuito. É desenvolvido por alguns engenheiros em nosso tempo livre. Todos os dados do mapa são do OpenStreetMap. Nenhum anúncio. Nenhum rastreamento. Seus dados pessoais não são coletados. Configurações gerais Aceitar diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index 6f66286d8e..344b46d3b8 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -220,9 +220,13 @@ Votați-ne aplicația Ajutor - + + Intrebari si raspunsuri + + Cum să ne sprijiniți? + Drepturi de autor - + Raportează o eroare Nu a fost stabilit programul de e-mail. Stabilește-l sau utilizează un alt mod de a ne contacta la %s. @@ -557,14 +561,8 @@ Aruncați o privire Organic Maps folosește în fundal geo-locația pentru a înregistra cel mai recent traseu urmat. - - Dați un calificativ pe Google Play - - Spuneți unui prieten - - Bună! Instalați Organic Maps! - - Organic Maps este o aplicație offline esențială când călătoriți. Organic Maps utilizează datele OpenStreeMap și permite editarea acestora. + + Organic Maps este o aplicație gratuită. Este dezvoltat de câțiva ingineri în timpul liber. Toate datele hărților sunt din OpenStreetMap. Fără reclame. Nici o urmărire. Datele dvs. personale nu sunt colectate. Setări generale Acceptați diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 651f115542..89f8e4cbd6 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -230,9 +230,13 @@ Оценить приложение Справка - + + Вопросы и ответы + + Как наc поддержать? + Копирайт - + Сообщить о проблеме Почтовый клиент не настроен. Настройте его или используйте другие способы для связи. Наш адрес - %s. @@ -573,14 +577,8 @@ Посмотри Organic Maps использует вашу геопозицию в фоновом режиме для записи недавно пройденного пути. - - Оценить в Google Play - - Рассказать друзьям - - Привет! Установи Organic Maps! - - Organic Maps — незаменимое приложение для путешествий, работающее без подключения к интернету. Organic Maps использует данные OpenStreetMap и позволяет их улучшать. + + Organic Maps - это бесплатное приложение, разработанное несколькими гиками свободное временя. Все данные карты из OpenStreetMap. Без рекламы. Нет отслеживания. Ваши личные данные не собираются. Общие настройки Принять diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index b4d4921a34..b69d7fd714 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -220,9 +220,13 @@ Ohodnotiť aplikáciu Nápoveda - + + Otázky a odpovede + + Ako nás podporiť? + Autorské práva - + Nahlásiť chybu Emailový klient nebol nastavený. Nakonfigurujte ho prosím alebo použite iný spôsob k tomu, abyste nás kontaktovali na %s @@ -556,14 +560,8 @@ Pozrite si Organic Maps používa vašu geopozíciu na pozadí pre zaznamenávanie vami nedávno precestovanej trasy. - - Ohodnotiť v službe Google Play - - Povedať priateľovi - - Ahoj! Nainštaluj si aplikáciu Organic Maps - - Organic Maps je offine aplikácia na cestovanie. Základom aplikácie Organic Maps sú dáta OpenStreetMap, pričom aplikácia nám ich umožňuje upravovať. + + Organic Maps je bezplatná aplikácia. Je vyvinutý niekoľkými inžiniermi v našom voľnom čase. Všetky údaje mapy sú z OpenSTREETMAP. Žiadne reklamy. Žiadne sledovanie. Vaše osobné údaje sa nezbierajú. Všeobecné nastavenia Prijať diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 5a1a37a44e..2035363c09 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -220,9 +220,13 @@ Ge appen ett betyg Hjälp - + + Frågor och svar + + Hur stöder vi oss? + Copyright - + Rapportera en bugg Emailklienten har inte konfigurerats. Konfigurera den eller använd ett annat sätt att kontakta oss på %s @@ -556,14 +560,8 @@ Kolla in Organic Maps använder din geografiska position i bakgrunden för att spela in din senaste resta rutt. - - Betygsätt på Google Play - - Tipsa en vän - - Hej! Installera Organic Maps! - - Organic Maps är en offline-applikation som du behöver när du reser. Organic Maps baseras på OpenStreetMap-data och tillåter redigering i den. + + Organic Maps är en gratis applikation. Den är utvecklad av några ingenjörer på vår fritid. Alla kartdata är från OpenStreetMap. Inga annonser. Ingen spårning. Dina personuppgifter samlas inte in. Allmänna inställningar Acceptera diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index 897e45ccc0..f780a30e1c 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -222,9 +222,13 @@ ให้คะแนนแอป ความช่วยเหลือ - + + คำถามและคำตอบ + + วิธีการสนับสนุนเรา + ลิขสิทธิ์ - + แจ้งข้อผิดพลาด อีเมลลูกค้ายังไม่ได้รับการจัดตั้งขึ้น กรุณาตั้งค่าหรือใช้วิธีอื่นที่จะติดต่อเราที่ %s @@ -560,14 +564,8 @@ ตรวจชม Organic Maps ใช้ตำแหน่งทางภูมิศาสตร์ของคุณในพื้นหลังเพื่อบันทึกเส้นทางที่คุณเดินทางเมื่อเร็ว ๆ นี้ - - ให้คะแนนบน Google Play - - บอกเพื่อน - - สวัสดี! ติดตั้ง Organic Maps กันเถอะ! - - Organic Maps เป็นแอปพลิเคชั่นออฟไลน์ที่จำเป็นสำหรับการท่องเที่ยว Organic Maps นั้นใช้งานบนพื้นฐานของข้อมูล OpenStreetMap และใช้แก้ไขได้ด้วย + + Organic Maps เป็นแอปพลิเคชั่นฟรีมันได้รับการพัฒนาโดยวิศวกรสองสามคนในเวลาว่างของเราข้อมูลแผนที่ทั้งหมดมาจาก OpenStreetMapไม่มีโฆษณาไม่มีการติดตาม. ข้อมูลส่วนบุคคลของคุณจะไม่ถูกเก็บรวบรวม การตั้งค่าทั่วไป ยอมรับ diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 34efdc45aa..9bf5b2c3d7 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -222,9 +222,13 @@ Uygulamayı değerlendir Yardım - + + Sorular ve cevaplar + + Bizi nasıl destekleyebilirim? + Telif hakkı - + Hata bildir E-posta istemcisi henüz kurulmamış. Lütfen e-posta istemcisini yapılandırın ya da bize %s adresinden ulaşmak için başka bir yöntem deneyin @@ -560,14 +564,8 @@ İncele Organic Maps, en son seyahat ettiğiniz rotayı kaydetmek için arka planda coğrafi konumunuzu kullanır. - - Google Play\'de Oy Ver - - Arkadaşınıza söyleyin - - Merhaba! Organic Maps\'yi hemen yükle! - - Organic Maps, seyahatler için vazgeçilmez bir çevrimdışı uygulamadır. Organic Maps, OpenStreetMap verilerine dayanmakta ve bu verilerin düzenlenmesini sağlamaktadır. + + Organic Maps ücretsiz bir uygulamadır. Boş zamanlarımızda birkaç mühendis tarafından geliştirilmiştir. Tüm harita verileri OpenStreetMap\'tendir. Reklamsız. İzleme yok. Kişisel verileriniz toplanmaz. Genel ayarlar Kabul diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index aa07240824..8b4f29152f 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -223,9 +223,13 @@ Оцінити застосунок Допомога - + + Питання та відповіді + + Як нас підтримати? + Копірайт - + Сповістити про помилку Поштовий клієнт не налаштований. Налаштуйте його або скористайтеся іншими способами зв\'язку. Наша адреса – %s. @@ -565,14 +569,8 @@ Подивись, Organic Maps використовує вашу геопозицію у фоновому режимі для запису нещодавно пройденого шляху. - - Рейтинг на Google Play - - Розповісти другу - - Привіт! Встанови Organic Maps! - - Organic Maps — це додаток must-have для мандрівників. У Organic Maps використовуються офлайн-дані OpenStreetMap, які можна редагувати. + + Organic Maps - це безкоштовна програма. Він розроблений кількома інженерами у вільний час. Всі дані карти є від OpenStreetMap. Немає реклами. Немає відстеження. Ваші особисті дані не збираються. Загальні налаштування Прийняти diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index 19e17feae3..04798940b6 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -220,9 +220,13 @@ Cho điểm ứng dụng Trợ giúp - + + Câu hỏi và trả lời + + Làm thế nào để hỗ trợ chúng tôi? + Bản quyền - + Báo cáo lỗi Trình khách email này chưa được thiết lập. Bạn vui lòng cấu hình nó hoặc sử dụng một cách khác để liên hệ với chúng tôi tại %s @@ -558,14 +562,8 @@ Xem Organic Maps sử dụng định vị của bạn trong ứng dụng chạy nền để ghi lại tuyến đường đã đi gần đây của bạn. - - Cho điểm trên Google Play - - Giới thiệu với Bạn bè - - Xin chào! Hãy cài đặt Organic Maps! - - Organic Maps là một ứng dụng ngoại tuyến thiết yếu khi đi du lịch. Organic Maps được dựa trên dữ liệu của OpenStreetMap và cho phép bạn hiệu chỉnh nó. + + Organic Maps là một ứng dụng miễn phí. Nó được phát triển bởi một vài kỹ sư trong thời gian rảnh của chúng tôi. Tất cả dữ liệu bản đồ là từ OpenStreetMap. Không quảng cáo. Không theo dõi. Dữ liệu cá nhân của bạn không được thu thập. Thiết lập chung Chấp nhận diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index af03da88ab..88bb72a64f 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -230,9 +230,13 @@ 為該應用程式評分 幫助 - + + 問題和解答 + + 如何支持我們？ + 版權 - + 報告錯誤 電子郵件客戶端尚未建立。請設定或使用任何其他方式與我們聯絡%s @@ -570,14 +574,8 @@ 看一看 Organic Maps使用背景中的地理位置記錄您最近去過的路徑。 - - 在 Google Play 評分 - - 告訴朋友 - - 嗨！安裝 Organic Maps！ - - Organic Maps 是一款基本離線旅遊應用程式。Organic Maps 以 OpenStreetMap 數據為基礎，並允許對其進行編輯。 + + Organic Maps是免費的申請。它是由我們的空閒時間的少數工程師開發的。所有地圖數據都來自OpenStreetMap。無廣告。沒有跟踪。您的個人數據不會收集。 一般設定 接受 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index 441baded96..9964f0f6c8 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -230,9 +230,13 @@ 为该应用打分 帮助 - + + 问题和解答 + + 如何支持我们？ + 版权 - + 报告漏洞 电子邮件客户端尚未建立。请配置或使用任何其他方式与我们联系%s @@ -570,14 +574,8 @@ 来看看 Organic Maps使用背景中的地理位置记录您最近去过的路径。 - - 在 Google Play 上的评分 - - 告诉朋友 - - 您好！安装 Organic Maps！ - - Organic Maps 是一款基本的离线旅行应用。Organic Maps 基于 OpenStreetMap 数据并且允许对其进行编辑。 + + Organic Maps是免费的申请。它是由我们的空闲时间的少数工程师开发的。所有地图数据都来自OpenStreetMap。无广告。没有跟踪。您的个人数据不会收集。 常规设置 接受 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 117b7d3d89..9d1276bdb3 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -244,9 +244,13 @@ Rate the app Help - + + FAQ + + How to support us? + Copyright - + Report a bug The email client has not been set up. Please configure it or use any other way to contact us at %s @@ -589,14 +593,8 @@ Check out Organic Maps uses your geoposition in the background for recording your recently traveled route. - - Rate on Google Play - - Tell a Friend - - Hi! Install Organic Maps! - - Organic Maps is an essential offline application for travelling. Organic Maps is based on OpenStreetMap data and allows editing it. + + Organic Maps is a free and open-source offline maps app, developed by a few geeks in their free time. All map data is from OpenStreetMap. No ads. No tracking and personal data collection. General settings Accept diff --git a/android/res/xml/prefs_main.xml b/android/res/xml/prefs_main.xml index 006586c8ad..62336791ac 100644 --- a/android/res/xml/prefs_main.xml +++ b/android/res/xml/prefs_main.xml @@ -165,12 +165,8 @@ - + android:order="1"> + + diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 38c1b91cee..1ce6ff50f6 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -8,7 +8,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.location.Location; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.KeyEvent; @@ -54,6 +53,7 @@ import com.mapswithme.maps.editor.EditorActivity; import com.mapswithme.maps.editor.EditorHostFragment; import com.mapswithme.maps.editor.FeatureCategoryActivity; import com.mapswithme.maps.editor.ReportFragment; +import com.mapswithme.maps.help.HelpActivity; import com.mapswithme.maps.intent.Factory; import com.mapswithme.maps.intent.MapTask; import com.mapswithme.maps.location.CompassData; @@ -2135,9 +2135,9 @@ public class MwmActivity extends BaseMwmFragmentActivity } } - public static class PointToPointDelegate extends AbstractClickMenuDelegate + public static class HelpDelegate extends AbstractClickMenuDelegate { - public PointToPointDelegate(@NonNull MwmActivity activity, @NonNull MainMenu.Item item) + public HelpDelegate(@NonNull MwmActivity activity, @NonNull MainMenu.Item item) { super(activity, item); } @@ -2145,7 +2145,8 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override void onMenuItemClickInternal() { - getActivity().startLocationToPoint(null, false); + Intent intent = new Intent(getActivity(), HelpActivity.class); + getActivity().startActivity(intent); } } diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java index 314f366305..c5269e7729 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java @@ -17,11 +17,6 @@ public class BaseMwmFragment extends Fragment implements OnBackPressListener Utils.detachFragmentIfCoreNotInitialized(context, this); } - public BaseMwmFragmentActivity getMwmActivity() - { - return Utils.castTo(getActivity()); - } - @Override public boolean onBackPressed() { diff --git a/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java b/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java index fa0e1b009a..0fc40deb1d 100644 --- a/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java @@ -14,6 +14,9 @@ import com.mapswithme.util.UiUtils; public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity { + @Nullable + private String mLastTitle; + @CallSuper @Override protected void onSafeCreate(@Nullable Bundle savedInstanceState) @@ -64,4 +67,39 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity return R.id.fragment_container; } + public void stackFragment(@NonNull Class fragmentClass, + @Nullable String title, @Nullable Bundle args) + { + final int resId = getFragmentContentResId(); + if (resId <= 0 || findViewById(resId) == null) + throw new IllegalStateException("Fragment can't be added, since getFragmentContentResId() " + + "isn't implemented or returns wrong resourceId."); + + String name = fragmentClass.getName(); + final Fragment fragment = Fragment.instantiate(this, name, args); + getSupportFragmentManager().beginTransaction() + .replace(resId, fragment, name) + .addToBackStack(null) + .commitAllowingStateLoss(); + getSupportFragmentManager().executePendingTransactions(); + + if (title != null) + { + Toolbar toolbar = getToolbar(); + if (toolbar != null && toolbar.getTitle() != null) + { + mLastTitle = toolbar.getTitle().toString(); + toolbar.setTitle(title); + } + } + } + + @Override + public void onBackPressed() + { + if (mLastTitle != null) + getToolbar().setTitle(mLastTitle); + + super.onBackPressed(); + } } diff --git a/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java b/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java index 20583b0292..17471a563d 100644 --- a/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java +++ b/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java @@ -12,12 +12,14 @@ import android.widget.TextView; import androidx.annotation.Nullable; +import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.widget.WheelProgressView; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; +import com.mapswithme.util.Utils; import java.util.List; import java.util.Locale; @@ -213,7 +215,8 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl break; case R.id.btn__select_map: - getMwmActivity().replaceFragment(DownloaderFragment.class, null, null); + MwmActivity activity = Utils.castTo(getActivity()); + activity.replaceFragment(DownloaderFragment.class, null, null); break; case R.id.wpv__download_progress: diff --git a/android/src/com/mapswithme/maps/settings/CopyrightFragment.java b/android/src/com/mapswithme/maps/help/CopyrightFragment.java similarity index 63% rename from android/src/com/mapswithme/maps/settings/CopyrightFragment.java rename to android/src/com/mapswithme/maps/help/CopyrightFragment.java index 4e0fbf7d09..4c2bcc7944 100644 --- a/android/src/com/mapswithme/maps/settings/CopyrightFragment.java +++ b/android/src/com/mapswithme/maps/help/CopyrightFragment.java @@ -1,4 +1,4 @@ -package com.mapswithme.maps.settings; +package com.mapswithme.maps.help; import android.content.Intent; import android.os.Bundle; @@ -10,24 +10,18 @@ import androidx.annotation.Nullable; import com.mapswithme.maps.R; import com.mapswithme.maps.WebContainerDelegate; +import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.base.OnBackPressListener; import com.mapswithme.util.Constants; -public class CopyrightFragment extends BaseSettingsFragment - implements OnBackPressListener +public class CopyrightFragment extends BaseMwmFragment implements OnBackPressListener { private WebContainerDelegate mDelegate; - @Override - protected int getLayoutRes() - { - return R.layout.fragment_web_view_with_progress; - } - @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View root = super.onCreateView(inflater, container, savedInstanceState); + View root = inflater.inflate(R.layout.fragment_web_view_with_progress, container, false); mDelegate = new WebContainerDelegate(root, Constants.Url.COPYRIGHT) { @@ -45,8 +39,9 @@ public class CopyrightFragment extends BaseSettingsFragment public boolean onBackPressed() { if (!mDelegate.onBackPressed()) - getSettingsActivity().replaceFragment(AboutFragment.class, - getString(R.string.about_menu_title), null); + { + ((HelpActivity) getActivity()).stackFragment(HelpFragment.class, getString(R.string.help), null); + } return true; } diff --git a/android/src/com/mapswithme/maps/settings/HelpFragment.java b/android/src/com/mapswithme/maps/help/FaqFragment.java similarity index 87% rename from android/src/com/mapswithme/maps/settings/HelpFragment.java rename to android/src/com/mapswithme/maps/help/FaqFragment.java index f66a9f7b22..4eb7ad0e38 100644 --- a/android/src/com/mapswithme/maps/settings/HelpFragment.java +++ b/android/src/com/mapswithme/maps/help/FaqFragment.java @@ -1,4 +1,4 @@ -package com.mapswithme.maps.settings; +package com.mapswithme.maps.help; import android.content.DialogInterface; import android.content.Intent; @@ -14,10 +14,11 @@ import androidx.appcompat.app.AlertDialog; import com.mapswithme.maps.R; import com.mapswithme.maps.WebContainerDelegate; +import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.util.Constants; import com.mapswithme.util.Utils; -public class HelpFragment extends BaseSettingsFragment +public class FaqFragment extends BaseMwmFragment { @NonNull private final DialogInterface.OnClickListener mDialogClickListener = new DialogInterface.OnClickListener() @@ -48,16 +49,10 @@ public class HelpFragment extends BaseSettingsFragment } }; - @Override - protected int getLayoutRes() - { - return R.layout.fragment_prefs_help; - } - @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View root = super.onCreateView(inflater, container, savedInstanceState); + View root = inflater.inflate(R.layout.fragment_prefs_faq, container, false); new WebContainerDelegate(root, Constants.Url.FAQ) { diff --git a/android/src/com/mapswithme/maps/help/HelpActivity.java b/android/src/com/mapswithme/maps/help/HelpActivity.java new file mode 100644 index 0000000000..d921f3c16a --- /dev/null +++ b/android/src/com/mapswithme/maps/help/HelpActivity.java @@ -0,0 +1,14 @@ +package com.mapswithme.maps.help; + +import androidx.fragment.app.Fragment; + +import com.mapswithme.maps.base.BaseToolbarActivity; + +public class HelpActivity extends BaseToolbarActivity +{ + @Override + protected Class getFragmentClass() + { + return HelpFragment.class; + } +} \ No newline at end of file diff --git a/android/src/com/mapswithme/maps/settings/AboutFragment.java b/android/src/com/mapswithme/maps/help/HelpFragment.java similarity index 55% rename from android/src/com/mapswithme/maps/settings/AboutFragment.java rename to android/src/com/mapswithme/maps/help/HelpFragment.java index eb5cec9ffc..e993a43376 100644 --- a/android/src/com/mapswithme/maps/settings/AboutFragment.java +++ b/android/src/com/mapswithme/maps/help/HelpFragment.java @@ -1,7 +1,6 @@ -package com.mapswithme.maps.settings; +package com.mapswithme.maps.help; -import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -17,13 +16,12 @@ import androidx.annotation.Nullable; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; +import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.util.Constants; import com.mapswithme.util.Graphics; -import com.mapswithme.util.SharingUtils; import com.mapswithme.util.Utils; -public class AboutFragment extends BaseSettingsFragment - implements View.OnClickListener +public class HelpFragment extends BaseMwmFragment implements View.OnClickListener { private void setupItem(@IdRes int id, boolean tint, @NonNull View frame) { @@ -33,19 +31,13 @@ public class AboutFragment extends BaseSettingsFragment Graphics.tint(view); } - @Override - protected int getLayoutRes() - { - return R.layout.about; - } - @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View root = super.onCreateView(inflater, container, savedInstanceState); + View root = inflater.inflate(R.layout.about, container, false); ((TextView) root.findViewById(R.id.version)) - .setText(getString(R.string.version, BuildConfig.VERSION_NAME)); + .setText(BuildConfig.VERSION_NAME); ((TextView) root.findViewById(R.id.data_version)) .setText(getString(R.string.data_version, Framework.nativeGetDataVersion())); @@ -56,8 +48,10 @@ public class AboutFragment extends BaseSettingsFragment setupItem(R.id.instagram, false, root); setupItem(R.id.facebook, false, root); setupItem(R.id.twitter, false, root); + setupItem(R.id.faq, true, root); + setupItem(R.id.report, true, root); + setupItem(R.id.contribute, true, root); setupItem(R.id.rate, true, root); - setupItem(R.id.share, true, root); setupItem(R.id.copyright, false, root); View termOfUseView = root.findViewById(R.id.term_of_use_link); View privacyPolicyView = root.findViewById(R.id.privacy_policy); @@ -85,49 +79,51 @@ public class AboutFragment extends BaseSettingsFragment @Override public void onClick(View v) { - try + switch (v.getId()) { - switch (v.getId()) - { - case R.id.web: - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.WEB_SITE))); - break; + case R.id.web: + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.WEB_SITE))); + break; - case R.id.github: - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.GITHUB))); - break; + case R.id.github: + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.GITHUB))); + break; - case R.id.telegram: - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TELEGRAM))); - break; + case R.id.telegram: + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TELEGRAM))); + break; - case R.id.instagram: - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.INSTAGRAM))); - break; + case R.id.instagram: + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.INSTAGRAM))); + break; - case R.id.facebook: - Utils.showFacebookPage(getActivity()); - break; + case R.id.facebook: + Utils.showFacebookPage(getActivity()); + break; - case R.id.twitter: - Utils.showTwitterPage(getActivity()); - break; + case R.id.twitter: + Utils.showTwitterPage(getActivity()); + break; - case R.id.rate: - Utils.openAppInMarket(getActivity(), BuildConfig.REVIEW_URL); - break; + case R.id.faq: + ((HelpActivity) getActivity()).stackFragment(FaqFragment.class, getString(R.string.faq), null); + break; - case R.id.share: - SharingUtils.shareApplication(getContext()); - break; + case R.id.report: + Utils.sendFeedback(getActivity()); + break; - case R.id.copyright: - getSettingsActivity().replaceFragment(CopyrightFragment.class, - getString(R.string.copyright), null); - break; - } - } catch (ActivityNotFoundException e) - { + case R.id.contribute: + Utils.showContributionPage(getActivity()); + break; + + case R.id.rate: + Utils.openAppInMarket(getActivity(), BuildConfig.REVIEW_URL); + break; + + case R.id.copyright: + ((HelpActivity) getActivity()).stackFragment(CopyrightFragment.class, getString(R.string.copyright), null); + break; } } } diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java index c9f63d1600..ae06fba4de 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java +++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java @@ -3,9 +3,6 @@ package com.mapswithme.maps.settings; import android.os.Bundle; import android.text.TextUtils; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; @@ -18,9 +15,6 @@ public class SettingsActivity extends BaseToolbarActivity implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, PreferenceFragmentCompat.OnPreferenceStartScreenCallback { - @Nullable - private String mLastTitle; - @Override protected int getContentLayoutResId() { @@ -41,7 +35,7 @@ public class SettingsActivity extends BaseToolbarActivity try { Class fragment = (Class) Class.forName(pref.getFragment()); - replaceFragment(fragment, title, pref.getExtras()); + stackFragment(fragment, title, pref.getExtras()); } catch (ClassNotFoundException e) { e.printStackTrace(); @@ -54,43 +48,7 @@ public class SettingsActivity extends BaseToolbarActivity { Bundle args = new Bundle(); args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, preferenceScreen.getKey()); - replaceFragment(SettingsPrefsFragment.class, preferenceScreen.getTitle().toString(), args); + stackFragment(SettingsPrefsFragment.class, preferenceScreen.getTitle().toString(), args); return true; } - - public void replaceFragment(@NonNull Class fragmentClass, - @Nullable String title, @Nullable Bundle args) - { - final int resId = getFragmentContentResId(); - if (resId <= 0 || findViewById(resId) == null) - throw new IllegalStateException("Fragment can't be added, since getFragmentContentResId() " + - "isn't implemented or returns wrong resourceId."); - - String name = fragmentClass.getName(); - final Fragment fragment = Fragment.instantiate(this, name, args); - getSupportFragmentManager().beginTransaction() - .replace(resId, fragment, name) - .addToBackStack(null) - .commitAllowingStateLoss(); - getSupportFragmentManager().executePendingTransactions(); - - if (title != null) - { - Toolbar toolbar = getToolbar(); - if (toolbar != null && toolbar.getTitle() != null) - { - mLastTitle = toolbar.getTitle().toString(); - toolbar.setTitle(title); - } - } - } - - @Override - public void onBackPressed() - { - if (mLastTitle != null) - getToolbar().setTitle(mLastTitle); - - super.onBackPressed(); - } } diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java index 10a692d051..127f5fe59d 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java +++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java @@ -722,7 +722,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment .show(); else // getSettingsActivity().switchToFragment(StoragePathFragment.class, R.string.maps_storage); - getSettingsActivity().replaceFragment(StoragePathFragment.class, + getSettingsActivity().stackFragment(StoragePathFragment.class, getString(R.string.maps_storage), null); return true; diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java index 15012b3cf2..f47d39f3af 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java @@ -75,14 +75,14 @@ public class MainMenu extends BaseMenu return new MwmActivity.SearchClickDelegate(activity, item); } }, - POINT_TO_POINT(R.id.p2p) + HELP(R.id.help) { @NonNull @Override public ClickMenuDelegate createClickDelegate(@NonNull MwmActivity activity, @NonNull Item item) { - return new MwmActivity.PointToPointDelegate(activity, item); + return new MwmActivity.HelpDelegate(activity, item); } }, BOOKMARKS(R.id.bookmarks) @@ -210,7 +210,7 @@ public class MainMenu extends BaseMenu { mapItem(Item.ADD_PLACE); mapItem(Item.SEARCH); - mapItem(Item.POINT_TO_POINT); + mapItem(Item.HELP); mapItem(Item.BOOKMARKS); mapItem(Item.SHARE_MY_LOCATION); mapItem(Item.DOWNLOAD_MAPS); diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java b/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java index de2eb10257..5e3ae70495 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java +++ b/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java @@ -83,9 +83,6 @@ public class MainMenuRenderer implements MenuRenderer TextView share = view.findViewById(R.id.share); share.setOnClickListener(v -> mListener.onShareLocationOptionSelected()); Graphics.tint(share); - TextView report = view.findViewById(R.id.report); - report.setOnClickListener(v -> mListener.onReportOptionSelected()); - Graphics.tint(report); } private void initLayersRecycler(@NonNull View view) diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java index 7aa0f276dd..1abeab3d22 100644 --- a/android/src/com/mapswithme/util/Constants.java +++ b/android/src/com/mapswithme/util/Constants.java @@ -15,6 +15,7 @@ public final class Constants { public static final String SHORT_SHARE_PREFIX = "om://"; public static final String HTTP_SHARE_PREFIX = "https://omaps.app/"; + public static final String INSTALL_LINK = "https://omaps.app/"; public static final String MAILTO_SCHEME = "mailto:"; public static final String MAIL_SUBJECT = "?subject="; @@ -27,6 +28,8 @@ public final class Constants public static final String TELEGRAM = "https://t.me/OrganicMapsApp"; public static final String INSTAGRAM = "https://www.instagram.com/organicmaps.app"; + public static final String CONTRIBUTE = "https://github.com/organicmaps/organicmaps/blob/master/docs/CONTRIBUTING.md#how-can-i-contribute"; + public static final String WEB_SITE = "https://organicmaps.app"; public static final String GITHUB = "https://github.com/organicmaps/organicmaps"; diff --git a/android/src/com/mapswithme/util/SharingUtils.java b/android/src/com/mapswithme/util/SharingUtils.java index cce0d6797b..8dccee4336 100644 --- a/android/src/com/mapswithme/util/SharingUtils.java +++ b/android/src/com/mapswithme/util/SharingUtils.java @@ -116,18 +116,4 @@ public class SharingUtils context.startActivity(Intent.createChooser(intent, context.getString(R.string.share))); } - - public static void shareApplication(@NonNull Context context) - { - Intent intent = new Intent(Intent.ACTION_SEND); - intent.setType(TEXT_MIME_TYPE); - - final String subject = context.getString(R.string.tell_friends); - intent.putExtra(Intent.EXTRA_SUBJECT, subject); - - final String text = context.getString(R.string.tell_friends_text); - intent.putExtra(Intent.EXTRA_TEXT, text); - - context.startActivity(Intent.createChooser(intent, context.getString(R.string.share))); - } } diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java index bdb331a45b..ebd1dfa58c 100644 --- a/android/src/com/mapswithme/util/Utils.java +++ b/android/src/com/mapswithme/util/Utils.java @@ -246,6 +246,11 @@ public class Utils activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.TWITTER))); } + public static void showContributionPage(Activity activity) + { + activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.CONTRIBUTE))); + } + public static void openUrl(@NonNull Context context, @Nullable String url) { if (TextUtils.isEmpty(url)) diff --git a/data/strings/strings.txt b/data/strings/strings.txt index 2e14fec6ff..eb3c99ea78 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -803,7 +803,7 @@ zh-Hant = 再試一次 [about_menu_title] - tags = android, ios + tags = ios en = About Organic Maps ar = حول Organic Maps be = Аб дадатку Organic Maps @@ -3307,7 +3307,7 @@ [version] comment = Prints version number in About dialog - tags = android, ios + tags = ios en = Version: %@ ar = الاصدار: %@ be = Версія: %@ @@ -4508,7 +4508,7 @@ [rate_the_app] comment = Text in menu - tags = ios + tags = android, ios en = Rate the app ar = تقييم التطبيق be = Ацаніць дадатак @@ -4580,8 +4580,83 @@ zh-Hans = 帮助 zh-Hant = 幫助 + [faq] + comment = Button in the main Help dialog + tags = android + en = FAQ + ar = ﺔﺑﻮﺟﺃﻭ ﺔﻠﺌﺳﺃ + be = Пытанні і адказы + bg = Въпроси и отговори + cs = Otázky a odpovědi + da = Spørgsmål og svar + de = Fragen und Antworten + el = Ερωτήσεις και απαντήσεις + es = Preguntas y respuestas + fa = ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ + fi = Kysymykset ja vastaukset + fr = Questions et réponses + he = תובושתו תולאש + hu = Kérdések és válaszok + id = Pertanyaan dan jawaban + it = Domande e risposte + ja = 質問と回答 + ko = 질문과 답변 + nb = Spørsmål og svar + nl = Vragen en antwoorden + pl = Pytania i odpowiedzi + pt = Perguntas e respostas + pt-BR = Perguntas e respostas + ro = Intrebari si raspunsuri + ru = Вопросы и ответы + sk = Otázky a odpovede + sv = Frågor och svar + sw = Maswali na majibu + th = คำถามและคำตอบ + tr = Sorular ve cevaplar + uk = Питання та відповіді + vi = Câu hỏi và trả lời + zh-Hans = 问题和解答 + zh-Hant = 問題和解答 + + [how_to_support_us] + comment = Button in the main Help dialog + tags = android + en = How to support us? + ar = كيف تدعم لنا؟ + be = Як нас падтрымаць? + bg = Как да ни подкрепите? + cs = Jak nás podpořit? + da = Sådan støtter vi os? + de = Wie unterstützen Sie uns? + el = Πώς να μας υποστηρίξετε; + es = ¿Cómo apoyarnos? + fa = چگونه از ما حمایت کنیم؟ + fi = Kuinka tukea meitä? + fr = Comment nous soutenir? + he = כיצד לתמוך בנו? + hu = Hogyan támogat minket? + id = Bagaimana cara mendukung kami? + it = Come supportarci? + ja = どのように私たちを支持する方法？ + ko = 우리를 지원하는 방법? + nb = Hvordan støtte oss? + nl = Hoe ons te steunen? + pl = Jak nas wspierać? + pt = Como nos apoiar? + ro = Cum să ne sprijiniți? + ru = Как наc поддержать? + sk = Ako nás podporiť? + sv = Hur stöder vi oss? + sw = Jinsi ya kutuunga mkono? + th = วิธีการสนับสนุนเรา + tr = Bizi nasıl destekleyebilirim? + uk = Як нас підтримати? + vi = Làm thế nào để hỗ trợ chúng tôi? + zh-Hans = 如何支持我们？ + zh-Hant = 如何支持我們？ + [copyright] - comment = Text in menu + comment = Button in the main Help dialog tags = android, ios en = Copyright ar = حقوق الطبع والنشر @@ -4618,7 +4693,7 @@ zh-Hant = 版權 [report_a_bug] - comment = Text in menu + comment = Text in menu + Button in the main Help dialog tags = android, ios en = Report a bug ar = الإبلاغ عن خطأ @@ -9113,7 +9188,7 @@ zh-Hant = 您已經改變了世界地圖。別藏私！告訴您的朋友們一起來編輯。 [share_with_friends] - tags = android, ios + tags = ios en = Share with friends ar = شارك مع الأصدقاء be = Падзяліцца з сябрамі @@ -13910,149 +13985,42 @@ zh-Hans = Organic Maps使用背景中的地理位置记录您最近去过的路径。 zh-Hant = Organic Maps使用背景中的地理位置記錄您最近去過的路徑。 - [rate_gp] - comment = Rate on Google Play (Android only) - tags = android - en = Rate on Google Play - ar = تصنيف على Google Play - be = Ацаніць на Google Play - bg = Оценка в Google Play - cs = Ohodnotit na Google Play - da = Bedøm på Google Play - de = Bei Google Play bewerten - el = Βαθμολογήστε το στο Google Play - es = Valorar en Google Play - fa = امتیاز دادن در گوگل پلی - fi = Arvioi Google Playssa - fr = Noter sur Google Play - hu = Arány a Google Play-n - id = Beri nilai di Google Play - it = Vota su Google Play - ja = Google Play で評価 - ko = Google Play에서 평가 - nb = Gi vurdering på Google Play - nl = Beoordeel op Google Play - pl = Oceń w Google Play - pt = Avaliar no Google Play - pt-BR = Avaliar em Google Play - ro = Dați un calificativ pe Google Play - ru = Оценить в Google Play - sk = Ohodnotiť v službe Google Play - sv = Betygsätt på Google Play - th = ให้คะแนนบน Google Play - tr = Google Play'de Oy Ver - uk = Рейтинг на Google Play - vi = Cho điểm trên Google Play - zh-Hans = 在 Google Play 上的评分 - zh-Hant = 在 Google Play 評分 - - [tell_friends] - comment = Share with friends: menu item title - tags = android - en = Tell a Friend - ar = أخبر صديق - be = Рассказаць сябрам - bg = Кажи на приятел - cs = Sdílet s přáteli - da = Sig det videre til en ven - de = Einem Freund empfehlen - el = Πείτε το σε ένα φίλο - es = Enviar a un amigo - fa = به یک دوست بگویید - fi = Kerro kaverille - fr = Recommander à un ami - hu = Mondja el egy ismerősének - id = Beri Tahu Teman - it = Dillo a un amico - ja = 友達に教える - ko = 친구에게 알려주기 - nb = Fortell en venn - nl = Vertel een Vriend - pl = Powiadom znajomego - pt = Indique a um amigo - pt-BR = Indique a um amigo - ro = Spuneți unui prieten - ru = Рассказать друзьям - sk = Povedať priateľovi - sv = Tipsa en vän - th = บอกเพื่อน - tr = Arkadaşınıza söyleyin - uk = Розповісти другу - vi = Giới thiệu với Bạn bè - zh-Hans = 告诉朋友 - zh-Hant = 告訴朋友 - - [tell_friends_text] - comment = Share with friends: sharing text - tags = android - en = Hi! Install Organic Maps! - ar = مرحبًا! تثبيت Organic Maps! - be = Прывітанне! Усталюй Organic Maps! - bg = Здравей! Инсталирай Organic Maps! - cs = Ahoj! Naisntalujte si Organic Maps! - da = Hej! Installer Organic Maps! - de = Hallo! Installiere dir Organic Maps! - el = Γεια σας! Εγκαταστήστε το Organic Maps! - es = ¡Hola! ¡Instala Organic Maps! - fa = سلام! Organic Maps را نصب کنید. - fi = Hei, asenna Organic Maps! - fr = Salut! Installe Organic Maps! - hu = Szia! Telepítsd a Organic Maps alkalmazást! - id = Hai! Instal Organic Maps yuk! - it = Ciao! Installa Organic Maps! - ja = こんにちは！Organic Maps をインストールしましょう！ - ko = 안녕하세요! Organic Maps를 설치하세요! - nb = Hei! Installer Organic Maps! - nl = Hallo! Installeer Organic Maps! - pl = Cześć! Zainstaluj Organic Maps! - pt = Olá! Instale o Organic Maps! - pt-BR = Olá! Instale o Organic Maps! - ro = Bună! Instalați Organic Maps! - ru = Привет! Установи Organic Maps! - sk = Ahoj! Nainštaluj si aplikáciu Organic Maps - sv = Hej! Installera Organic Maps! - th = สวัสดี! ติดตั้ง Organic Maps กันเถอะ! - tr = Merhaba! Organic Maps'yi hemen yükle! - uk = Привіт! Встанови Organic Maps! - vi = Xin chào! Hãy cài đặt Organic Maps! - zh-Hans = 您好！安装 Organic Maps！ - zh-Hant = 嗨！安裝 Organic Maps！ - [about_description] - comment = About short text (below logo) + comment = About short text tags = android, ios - en = Organic Maps is an essential offline application for travelling. Organic Maps is based on OpenStreetMap data and allows editing it. - ar = Organic Maps هو تطبيق أساسي للسفر بدون اتصال بالإنترنت. يعتمد برنامج Organic Maps على بيانات OpenStreetMap ويتيح تحريرها. - be = Organic Maps — неабходны дататак для падарожжаў, каторы працуе без падлучэння да інтэрнэту. Organic Maps ужывае дадзеныя OpenStreetMap і дазваляе іх правіць. - bg = Organic Maps е офлайн приложение за пътуване. Organic Maps се основава на данни от OpenStreetMap и позволява тяхното редактиране. - cs = Organic Maps je základní aplikace pro každého cestovatele. Organic Maps je založena na datech z OpenStreetMap a umožňuje je upravovat. - da = Organic Maps er en essentiel offline-app for rejsende. Organic Maps er baseret på data fra OpenStreetMap, og gør det muligt at redigere disse data. - de = Organic Maps ist eine wichtige Offline-App zum Reisen. Organic Maps basiert auf OpenStreetMap-Daten und ermöglicht das Bearbeiten dieser. - el = Το Organic Maps είναι η απαραίτητη εφαρμογή γα ταξίδια που λειτουργεί εκτός σύνδεσης. Το Organic Maps βασίζεται σε δεδομένα OpenStreetMap και σας επιτρέπει να τα επεξεργαστείτε. - es = Organic Maps es una aplicación esencial offline para viajar. Organic Maps se basa en datos de OpenStreetMap y permite editarla. - fa = Organic Maps یک نرم افزار افلاین مخصوص سفر است. Organic Maps بر پایه دیتای OpenStreetMap است و به شما اجازه ویرایش در ان را می دهد. - fi = Organic Maps on ehdoton offline-sovellus matkoja varten. Organic Maps perustuu OpenStreetMap-dataan ja sallii sen muokkauksen. - fr = Organic Maps est une application hors ligne essentielle pour les voyages. Organic Maps se base sur les données OpenStreetMap et permet de les modifier. - hu = A Organic Maps egy nélkülözhetetlen alkalmazás utazáshoz. A Organic Maps az OpenStreetMap adataira épül, és lehetővé teszi ezek szerkesztését. - id = Organic Maps adalah aplikasi offline yang sangat berguna untuk bepergian. Organic Maps didasarkan pada data OpenStreetMap dan memungkinkan kita untuk mengeditnya. - it = Organic Maps è un'applicazione offline essenziale per chi ama viaggiare. Organic Maps si basa sui dati OpenStreetMap e consente di apportare modifiche. - ja = Organic Maps は旅に必要不可欠なオフラインアプリケーションです。Organic Maps は OpenStreetMap データに基づいており、データを編集することができます。 - ko = Organic Maps는 여행용 필수 오프라인 응용 프로그램입니다. Organic Maps는 OpenStreetMap 데이터를 기반으로 하며 이 데이터 편집을 허용합니다. - nb = Organic Maps er en offline app for reising. Organic Maps bygger på OpenStreetMap-data og tillater redigering av den. - nl = Organic Maps is een essentiële offline applicatie om te reizen. Organic Maps is gebaseerd op OpenStreetMap gegevens en laat bewerking toe. - pl = Organic Maps to niezbędna aplikacja do podróży działająca w trybie offline. Organic Maps opiera się o dane OpenStreetMap oraz umożliwia ich edycję. - pt = O Organic Maps é uma aplicação offline essencial para viajar. O Organic Maps baseia-se nos dados do OpenStreetMap e permite editá-los. - pt-BR = O Organic Maps é um aplicativo offline essencial para viajar. O Organic Maps se baseia nos dados do OpenStreetMap e permite editá-los. - ro = Organic Maps este o aplicație offline esențială când călătoriți. Organic Maps utilizează datele OpenStreeMap și permite editarea acestora. - ru = Organic Maps — незаменимое приложение для путешествий, работающее без подключения к интернету. Organic Maps использует данные OpenStreetMap и позволяет их улучшать. - sk = Organic Maps je offine aplikácia na cestovanie. Základom aplikácie Organic Maps sú dáta OpenStreetMap, pričom aplikácia nám ich umožňuje upravovať. - sv = Organic Maps är en offline-applikation som du behöver när du reser. Organic Maps baseras på OpenStreetMap-data och tillåter redigering i den. - th = Organic Maps เป็นแอปพลิเคชั่นออฟไลน์ที่จำเป็นสำหรับการท่องเที่ยว Organic Maps นั้นใช้งานบนพื้นฐานของข้อมูล OpenStreetMap และใช้แก้ไขได้ด้วย - tr = Organic Maps, seyahatler için vazgeçilmez bir çevrimdışı uygulamadır. Organic Maps, OpenStreetMap verilerine dayanmakta ve bu verilerin düzenlenmesini sağlamaktadır. - uk = Organic Maps — це додаток must-have для мандрівників. У Organic Maps використовуються офлайн-дані OpenStreetMap, які можна редагувати. - vi = Organic Maps là một ứng dụng ngoại tuyến thiết yếu khi đi du lịch. Organic Maps được dựa trên dữ liệu của OpenStreetMap và cho phép bạn hiệu chỉnh nó. - zh-Hans = Organic Maps 是一款基本的离线旅行应用。Organic Maps 基于 OpenStreetMap 数据并且允许对其进行编辑。 - zh-Hant = Organic Maps 是一款基本離線旅遊應用程式。Organic Maps 以 OpenStreetMap 數據為基礎，並允許對其進行編輯。 + en = Organic Maps is a free and open-source offline maps app, developed by a few geeks in their free time. All map data is from OpenStreetMap. No ads. No tracking and personal data collection. + ar = Organic Maps هو تطبيق مجاني. تم تطويره من قبل عدد قليل من المهندسين في وقت فراغنا. جميع بيانات الخريطة من OpenStreetMap. لا اعلانات. لا تتبع. لم يتم جمع بياناتك الشخصية. + be = Organic Maps гэта бясплатнае прыкладанне. Ён распрацаваны некалькіх інжынераў у вольны час. Усе дадзеныя карты з OpenstreetMap. Няма аб'яваў. Няма адсочвання. Вашы асабістыя дадзеныя не збіраюцца. + bg = Organic Maps е безплатно приложение. Разработено е от няколко инженери в свободното ни време. Всички картографски данни са от OpenstreetMap. Без реклами. Без проследяване. Вашите лични данни не се събират. + cs = Organic Maps je bezplatná aplikace. Vyvíjejí se několik inženýrů v našem volném čase. Všechna mapová data jsou z OpenStreetMap. Žádné reklamy. Žádné sledování. Vaše osobní údaje nejsou shromažďovány. + da = Organic Maps er en gratis applikation. Det er udviklet af et par ingeniører i vores fritid. Alle kortdata er fra OpenSTreetMap. Ingen annoncer. Ingen sporing. Dine personlige data indsamles ikke. + de = Organic Maps ist eine kostenlose Anwendung. Es wird von einigen Ingenieuren in unserer Freizeit entwickelt. Alle Kartendaten stammen aus OpenStreetMap. Keine Werbung. Keine Verfolgung. Ihre persönlichen Daten werden nicht gesammelt. + el = Ο Organic Maps είναι μια δωρεάν εφαρμογή. Αναπτύσσεται από λίγους μηχανικούς στον ελεύθερο χρόνο μας. Όλα τα δεδομένα χάρτη είναι από το OpenStreetMap. Χωρίς διαφημίσεις. Χωρίς εντοπισμό. Τα προσωπικά σας δεδομένα δεν συλλέγονται. + es = Organic Maps es una aplicación gratuita. Es desarrollado por unos pocos ingenieros en nuestro tiempo libre. Todos los datos de mapas son de OpenStreetMap. Sin anuncios. Sin seguimiento. Sus datos personales no se recopilan. + fa = Organic Maps یک برنامه رایگان است. این توسط چند مهندس در زمان آزاد ما توسعه یافته است. تمام داده های نقشه از OpenStreetMap است. بدون تبلیغاتبدون ردیابیاطلاعات شخصی شما جمع آوری نشده است. + fi = Organic Maps on ilmainen sovellus. Se kehittää muutamia insinöörejä vapaa-ajalla. Kaikki karttatiedot ovat OpenStreetMapista. Ei mainoksia. Ei seurantaa. Henkilötietojasi ei kerätä. + fr = Organic Maps est une application gratuite. Il est développé par quelques ingénieurs dans notre temps libre. Toutes les données cartographiques proviennent de OpenStreetMap. Pas de pubs. Pas de localisation. Vos données personnelles ne sont pas collectées. + he = Organic Maps הוא יישום חינם. הוא פותח על ידי כמה מהנדסים בזמן הפנוי שלנו. כל נתוני המפה הם מ- OpenStreetmap. ללא פרסומות. אין מעקב. הנתונים האישיים שלך אינם נאספים. + hu = Az Organic Maps ingyenes alkalmazás. A szabadidőben néhány mérnök fejlett. Az összes térképadat az OpenStreetMapból származik. Nincsenek hirdetések. Nincs nyomkövetés. Az Ön személyes adatait nem gyűjtik össze. + id = Organic Maps adalah aplikasi gratis. Ini dikembangkan oleh beberapa insinyur di waktu luang kami. Semua data peta berasal dari openstreetmap. Tanpa iklan. Tidak ada pelacakan. Data pribadi Anda tidak dikumpulkan. + it = Organic Maps è un'applicazione gratuita. È sviluppato da alcuni ingegneri nel nostro tempo libero. Tutti i dati della mappa provengono da OpenStreetMap. Nessuna pubblicità. No tracciabilità. I tuoi dati personali non sono raccolti. + ja = Organic Mapsは無料のアプリケーションです。それは私たちの自由な時間にいくつかのエンジニアによって開発されています。すべての地図データはOpenStreetMapからのものです。広告なし。全く追跡しません。あなたの個人データは収集されません。 + ko = Organic Maps는 무료 응용 프로그램입니다. 그것은 자유 시간에 몇 명의 엔지니어가 개발했습니다. 모든지도 데이터는 OpenStreetMap에서입니다. 광고 없음. 추적 없음. 귀하의 개인 데이터는 수집되지 않습니다. + nb = Organic Maps er en gratis applikasjon. Den er utviklet av noen ingeniører på fritiden. Alle kartdata er fra OpenStreetMap. Ingen annonser. Ingen sporing. Dine personopplysninger er ikke samlet. + nl = Organic Maps is een gratis applicatie. Het is ontwikkeld door een paar ingenieurs in onze vrije tijd. Alle kaartgegevens zijn van OpenStreetMap. Geen advertenties. Geen volgen. Uw persoonlijke gegevens worden niet verzameld. + pl = Organic Maps to darmowa aplikacja. Jest rozwijany przez kilku inżynierów w naszym wolnym czasie. Wszystkie dane mapowe pochodzą z OpenStreetMap. Bez reklam. Bez śledzenia. Twoje dane osobowe nie są gromadzone. + pt = Organic Maps é um aplicativo gratuito. É desenvolvido por alguns engenheiros em nosso tempo livre. Todos os dados do mapa são do OpenStreetMap. Nenhum anúncio. Nenhum rastreamento. Seus dados pessoais não são coletados. + ro = Organic Maps este o aplicație gratuită. Este dezvoltat de câțiva ingineri în timpul liber. Toate datele hărților sunt din OpenStreetMap. Fără reclame. Nici o urmărire. Datele dvs. personale nu sunt colectate. + ru = Organic Maps - это бесплатное приложение, разработанное несколькими гиками свободное временя. Все данные карты из OpenStreetMap. Без рекламы. Нет отслеживания. Ваши личные данные не собираются. + sk = Organic Maps je bezplatná aplikácia. Je vyvinutý niekoľkými inžiniermi v našom voľnom čase. Všetky údaje mapy sú z OpenSTREETMAP. Žiadne reklamy. Žiadne sledovanie. Vaše osobné údaje sa nezbierajú. + sv = Organic Maps är en gratis applikation. Den är utvecklad av några ingenjörer på vår fritid. Alla kartdata är från OpenStreetMap. Inga annonser. Ingen spårning. Dina personuppgifter samlas inte in. + sw = Organic Maps ni programu ya bure. Inatengenezwa na wahandisi wachache wakati wetu wa bure. Takwimu zote za ramani ni kutoka kwa OpenStreetMap. Hakuna matangazo. Hakuna kufuatilia. Takwimu zako za kibinafsi hazikusanywa. + th = Organic Maps เป็นแอปพลิเคชั่นฟรีมันได้รับการพัฒนาโดยวิศวกรสองสามคนในเวลาว่างของเราข้อมูลแผนที่ทั้งหมดมาจาก OpenStreetMapไม่มีโฆษณาไม่มีการติดตาม. ข้อมูลส่วนบุคคลของคุณจะไม่ถูกเก็บรวบรวม + tr = Organic Maps ücretsiz bir uygulamadır. Boş zamanlarımızda birkaç mühendis tarafından geliştirilmiştir. Tüm harita verileri OpenStreetMap'tendir. Reklamsız. İzleme yok. Kişisel verileriniz toplanmaz. + uk = Organic Maps - це безкоштовна програма. Він розроблений кількома інженерами у вільний час. Всі дані карти є від OpenStreetMap. Немає реклами. Немає відстеження. Ваші особисті дані не збираються. + vi = Organic Maps là một ứng dụng miễn phí. Nó được phát triển bởi một vài kỹ sư trong thời gian rảnh của chúng tôi. Tất cả dữ liệu bản đồ là từ OpenStreetMap. Không quảng cáo. Không theo dõi. Dữ liệu cá nhân của bạn không được thu thập. + zh-Hans = Organic Maps是免费的申请。它是由我们的空闲时间的少数工程师开发的。所有地图数据都来自OpenStreetMap。无广告。没有跟踪。您的个人数据不会收集。 + zh-Hant = Organic Maps是免費的申請。它是由我們的空閒時間的少數工程師開發的。所有地圖數據都來自OpenStreetMap。無廣告。沒有跟踪。您的個人數據不會收集。 [general_settings] tags = ios @@ -17499,7 +17467,7 @@ zh-Hant = 從卡中隱藏 [public_access] - tags = android, ios + tags = android en = Public access ar = إطلاع الجمهور be = Публічны доступ @@ -17536,7 +17504,7 @@ zh-Hant = 公共訪問 [limited_access] - tags = android, ios + tags = android en = Limited access ar = محدودية فرص حصول be = Абмежаваны доступ @@ -17645,7 +17613,7 @@ zh-Hant = 添加說明(文字或html) [not_shared] - tags = android, ios + tags = android en = Private ar = خاص be = Прыватны @@ -18237,7 +18205,7 @@ zh-Hant = 此選項啟用以記錄操作來進行診斷。這有助於團隊識別應用程序的問題。請僅在Organic Maps支持請求時開啟該選項。 [access_rules_author_only] - tags = android, ios + tags = android en = Online editing ar = التحرير على الإنترنت be = Рэдагаванне анлайн diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 34b176bdbc..69559ad280 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -6,6 +6,10 @@ Thank you for your interest in contributing to Organic Maps! There are many ways to contribute. +### Donate + +See https://organicmaps.app/donate/ + ### Bug Reports The simplest way to contribute is to [submit an issue](https://github.com/organicmaps/organicmaps/issues). diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 763ba2b572..3448009692 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "مساعدة"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "ﺔﺑﻮﺟﺃﻭ ﺔﻠﺌﺳﺃ"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "كيف تدعم لنا؟"; + +/* Button in the main Help dialog */ "copyright" = "حقوق الطبع والنشر"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "الإبلاغ عن خطأ"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "يستخدم Organic Maps موقعك الجغرافي في الخلفية لتسجيل مسار سفرك الأخير."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "تصنيف على Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "أخبر صديق"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "مرحبًا! تثبيت Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps هو تطبيق أساسي للسفر بدون اتصال بالإنترنت. يعتمد برنامج Organic Maps على بيانات OpenStreetMap ويتيح تحريرها."; +/* About short text */ +"about_description" = "Organic Maps هو تطبيق مجاني. تم تطويره من قبل عدد قليل من المهندسين في وقت فراغنا. جميع بيانات الخريطة من OpenStreetMap. لا اعلانات. لا تتبع. لم يتم جمع بياناتك الشخصية."; "general_settings" = "إعدادات عامة"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index 48caa5e8f6..b38788a606 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Дапамога"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Пытанні і адказы"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Як нас падтрымаць?"; + +/* Button in the main Help dialog */ "copyright" = "Капірайт"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Паведаміць аб памылцы"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps ужывае вашу геалакацыю ў фонавым рэжыме каб запісваць ваш нядаўна пройдзены маршрут."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Ацаніць на Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Рассказаць сябрам"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Прывітанне! Усталюй Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps — неабходны дататак для падарожжаў, каторы працуе без падлучэння да інтэрнэту. Organic Maps ужывае дадзеныя OpenStreetMap і дазваляе іх правіць."; +/* About short text */ +"about_description" = "Organic Maps гэта бясплатнае прыкладанне. Ён распрацаваны некалькіх інжынераў у вольны час. Усе дадзеныя карты з OpenstreetMap. Няма аб'яваў. Няма адсочвання. Вашы асабістыя дадзеныя не збіраюцца."; "general_settings" = "Агульныя налады"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index 94f4aa4b0d..9f8526eb56 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Помощ"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Въпроси и отговори"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Как да ни подкрепите?"; + +/* Button in the main Help dialog */ "copyright" = "Авторски права"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Докладване на проблем"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps използва геопозицията ви във фонов режим за записване на последния ви маршрут."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Оценка в Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Кажи на приятел"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Здравей! Инсталирай Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps е офлайн приложение за пътуване. Organic Maps се основава на данни от OpenStreetMap и позволява тяхното редактиране."; +/* About short text */ +"about_description" = "Organic Maps е безплатно приложение. Разработено е от няколко инженери в свободното ни време. Всички картографски данни са от OpenstreetMap. Без реклами. Без проследяване. Вашите лични данни не се събират."; "general_settings" = "Общи настройки"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 8171b2d7df..12b2b34ae4 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Nápověda"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Otázky a odpovědi"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Jak nás podpořit?"; + +/* Button in the main Help dialog */ "copyright" = "Autorská práva"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Nahlásit chybu"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps používají geopozici na pozadí, aby se zaznamenala vaše nedávno ujetá trasa."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Ohodnotit na Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Sdílet s přáteli"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Ahoj! Naisntalujte si Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps je základní aplikace pro každého cestovatele. Organic Maps je založena na datech z OpenStreetMap a umožňuje je upravovat."; +/* About short text */ +"about_description" = "Organic Maps je bezplatná aplikace. Vyvíjejí se několik inženýrů v našem volném čase. Všechna mapová data jsou z OpenStreetMap. Žádné reklamy. Žádné sledování. Vaše osobní údaje nejsou shromažďovány."; "general_settings" = "Obecná nastavení"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index d42c81e19d..0b611fab53 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Hjælp"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Spørgsmål og svar"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Sådan støtter vi os?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Rapportér fejl"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps anvender din geoposition i baggrunden til at gemme din seneste rejserute."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Bedøm på Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Sig det videre til en ven"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hej! Installer Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps er en essentiel offline-app for rejsende. Organic Maps er baseret på data fra OpenStreetMap, og gør det muligt at redigere disse data."; +/* About short text */ +"about_description" = "Organic Maps er en gratis applikation. Det er udviklet af et par ingeniører i vores fritid. Alle kortdata er fra OpenSTreetMap. Ingen annoncer. Ingen sporing. Dine personlige data indsamles ikke."; "general_settings" = "Generelle indstillinger"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 367bdc4315..064b1b68c5 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Hilfe"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Fragen und Antworten"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Wie unterstützen Sie uns?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Fehler melden"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps verwendet Ihre Geoposition im Hintergrund, um Ihre kürzlich gefahrene Route aufzunehmen."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Bei Google Play bewerten"; - -/* Share with friends: menu item title */ -"tell_friends" = "Einem Freund empfehlen"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hallo! Installiere dir Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps ist eine wichtige Offline-App zum Reisen. Organic Maps basiert auf OpenStreetMap-Daten und ermöglicht das Bearbeiten dieser."; +/* About short text */ +"about_description" = "Organic Maps ist eine kostenlose Anwendung. Es wird von einigen Ingenieuren in unserer Freizeit entwickelt. Alle Kartendaten stammen aus OpenStreetMap. Keine Werbung. Keine Verfolgung. Ihre persönlichen Daten werden nicht gesammelt."; "general_settings" = "Allgemeine Einstellungen"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index bf44a1922d..4754353000 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Βοήθεια"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Ερωτήσεις και απαντήσεις"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Πώς να μας υποστηρίξετε;"; + +/* Button in the main Help dialog */ "copyright" = "Πνευματικά δικαιώματα"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Αναφορά σφάλματος"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Το Organic Maps χρησιμοποιεί τη γεωγραφική σας τοποθεσία στο παρασκήνιο για την καταγραφή των πρόσφατων διαδρομών σας."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Βαθμολογήστε το στο Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Πείτε το σε ένα φίλο"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Γεια σας! Εγκαταστήστε το Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Το Organic Maps είναι η απαραίτητη εφαρμογή γα ταξίδια που λειτουργεί εκτός σύνδεσης. Το Organic Maps βασίζεται σε δεδομένα OpenStreetMap και σας επιτρέπει να τα επεξεργαστείτε."; +/* About short text */ +"about_description" = "Ο Organic Maps είναι μια δωρεάν εφαρμογή. Αναπτύσσεται από λίγους μηχανικούς στον ελεύθερο χρόνο μας. Όλα τα δεδομένα χάρτη είναι από το OpenStreetMap. Χωρίς διαφημίσεις. Χωρίς εντοπισμό. Τα προσωπικά σας δεδομένα δεν συλλέγονται."; "general_settings" = "Γενικές ρυθμίσεις"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 062b94033c..8463337cf2 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Help"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "FAQ"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "How to support us?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Report a bug"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps uses your geoposition in the background for recording your recently traveled route."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Rate on Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Tell a Friend"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hi! Install Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps is an essential offline application for travelling. Organic Maps is based on OpenStreetMap data and allows editing it."; +/* About short text */ +"about_description" = "Organic Maps is a free and open-source offline maps app, developed by a few geeks in their free time. All map data is from OpenStreetMap. No ads. No tracking and personal data collection."; "general_settings" = "General settings"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index e3435be866..80c23de837 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Help"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "FAQ"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "How to support us?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Report a bug"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps uses your geoposition in the background for recording your recently traveled route."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Rate on Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Tell a Friend"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hi! Install Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps is an essential offline application for travelling. Organic Maps is based on OpenStreetMap data and allows editing it."; +/* About short text */ +"about_description" = "Organic Maps is a free and open-source offline maps app, developed by a few geeks in their free time. All map data is from OpenStreetMap. No ads. No tracking and personal data collection."; "general_settings" = "General settings"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index 653d440a35..d3bc96fe04 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Help"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "FAQ"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "How to support us?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Report a bug"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps uses your geoposition in the background for recording your recently traveled route."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Rate on Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Tell a Friend"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hi! Install Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps is an essential offline application for travelling. Organic Maps is based on OpenStreetMap data and allows editing it."; +/* About short text */ +"about_description" = "Organic Maps is a free and open-source offline maps app, developed by a few geeks in their free time. All map data is from OpenStreetMap. No ads. No tracking and personal data collection."; "general_settings" = "General settings"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index bff9d8cfb4..bb3ee28abd 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Ayuda"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Preguntas y respuestas"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "¿Cómo apoyarnos?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Hay un error"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps usa tu geolocalización en segundo plano para registrar tu ruta recorrida recientemente."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Valorar en Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Enviar a un amigo"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "¡Hola! ¡Instala Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps es una aplicación esencial offline para viajar. Organic Maps se basa en datos de OpenStreetMap y permite editarla."; +/* About short text */ +"about_description" = "Organic Maps es una aplicación gratuita. Es desarrollado por unos pocos ingenieros en nuestro tiempo libre. Todos los datos de mapas son de OpenStreetMap. Sin anuncios. Sin seguimiento. Sus datos personales no se recopilan."; "general_settings" = "Ajustes generales"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index 8b81c6c3c6..d637688ff2 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "کمک"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "چگونه از ما حمایت کنیم؟"; + +/* Button in the main Help dialog */ "copyright" = "حق نشر و کپی رایت"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "گزارش خطا"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps از اطلاعات موقعیت مکانی شما در پس ضمینه برای ذخیره مسیر هایی که اخیرا سفر کرده اید استفاده می کند."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "امتیاز دادن در گوگل پلی"; - -/* Share with friends: menu item title */ -"tell_friends" = "به یک دوست بگویید"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "سلام! Organic Maps را نصب کنید."; - -/* About short text (below logo) */ -"about_description" = "Organic Maps یک نرم افزار افلاین مخصوص سفر است. Organic Maps بر پایه دیتای OpenStreetMap است و به شما اجازه ویرایش در ان را می دهد."; +/* About short text */ +"about_description" = "Organic Maps یک برنامه رایگان است. این توسط چند مهندس در زمان آزاد ما توسعه یافته است. تمام داده های نقشه از OpenStreetMap است. بدون تبلیغاتبدون ردیابیاطلاعات شخصی شما جمع آوری نشده است."; "general_settings" = "تنظیمات عمومی"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 913fe0d3aa..fd8535801f 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Ohje"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Kysymykset ja vastaukset"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Kuinka tukea meitä?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Ilmoita virheestä"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "MAPS.SE käyttää taustalla geosijaintia sinun viimeisen matkareitin tallentamiseksi."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Arvioi Google Playssa"; - -/* Share with friends: menu item title */ -"tell_friends" = "Kerro kaverille"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hei, asenna Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps on ehdoton offline-sovellus matkoja varten. Organic Maps perustuu OpenStreetMap-dataan ja sallii sen muokkauksen."; +/* About short text */ +"about_description" = "Organic Maps on ilmainen sovellus. Se kehittää muutamia insinöörejä vapaa-ajalla. Kaikki karttatiedot ovat OpenStreetMapista. Ei mainoksia. Ei seurantaa. Henkilötietojasi ei kerätä."; "general_settings" = "Yleiset asetukset"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index d21bcc92dd..10859483a2 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Aide"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Questions et réponses"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Comment nous soutenir?"; + +/* Button in the main Help dialog */ "copyright" = "Tous droits réservés"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Signaler un bug"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps utilise votre géolocalisation en arrière-plan pour enregistrer vos itinéraires récents."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Noter sur Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Recommander à un ami"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Salut! Installe Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps est une application hors ligne essentielle pour les voyages. Organic Maps se base sur les données OpenStreetMap et permet de les modifier."; +/* About short text */ +"about_description" = "Organic Maps est une application gratuite. Il est développé par quelques ingénieurs dans notre temps libre. Toutes les données cartographiques proviennent de OpenStreetMap. Pas de pubs. Pas de localisation. Vos données personnelles ne sont pas collectées."; "general_settings" = "Paramètres généraux"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index 9c525fb299..464f348fee 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Segítség"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Kérdések és válaszok"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Hogyan támogat minket?"; + +/* Button in the main Help dialog */ "copyright" = "Szerzői jog"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Hibabejelentés"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "A Organic Maps a geopozíciód használatával a háttérben rögzíti a legutóbb megtett utad."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Arány a Google Play-n"; - -/* Share with friends: menu item title */ -"tell_friends" = "Mondja el egy ismerősének"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Szia! Telepítsd a Organic Maps alkalmazást!"; - -/* About short text (below logo) */ -"about_description" = "A Organic Maps egy nélkülözhetetlen alkalmazás utazáshoz. A Organic Maps az OpenStreetMap adataira épül, és lehetővé teszi ezek szerkesztését."; +/* About short text */ +"about_description" = "Az Organic Maps ingyenes alkalmazás. A szabadidőben néhány mérnök fejlett. Az összes térképadat az OpenStreetMapból származik. Nincsenek hirdetések. Nincs nyomkövetés. Az Ön személyes adatait nem gyűjtik össze."; "general_settings" = "Általános beállítások"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 2563b3deb0..927ca98e66 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Bantuan"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Pertanyaan dan jawaban"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Bagaimana cara mendukung kami?"; + +/* Button in the main Help dialog */ "copyright" = "Hak cipta"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Laporkan gangguan"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps menggunakan geoposisi di latar belakang untuk merekam rute yang baru Anda lalui."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Beri nilai di Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Beri Tahu Teman"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hai! Instal Organic Maps yuk!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps adalah aplikasi offline yang sangat berguna untuk bepergian. Organic Maps didasarkan pada data OpenStreetMap dan memungkinkan kita untuk mengeditnya."; +/* About short text */ +"about_description" = "Organic Maps adalah aplikasi gratis. Ini dikembangkan oleh beberapa insinyur di waktu luang kami. Semua data peta berasal dari openstreetmap. Tanpa iklan. Tidak ada pelacakan. Data pribadi Anda tidak dikumpulkan."; "general_settings" = "Setelan umum"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index e18a45114b..ac80199d3b 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Aiuto"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Domande e risposte"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Come supportarci?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Riporta un bug"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps usa la tua posizione geografica in background per registrare il tuo percorso effettuato più di recente."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Vota su Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Dillo a un amico"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Ciao! Installa Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps è un'applicazione offline essenziale per chi ama viaggiare. Organic Maps si basa sui dati OpenStreetMap e consente di apportare modifiche."; +/* About short text */ +"about_description" = "Organic Maps è un'applicazione gratuita. È sviluppato da alcuni ingegneri nel nostro tempo libero. Tutti i dati della mappa provengono da OpenStreetMap. Nessuna pubblicità. No tracciabilità. I tuoi dati personali non sono raccolti."; "general_settings" = "Impostazioni generali"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index 028cea1363..bfdafdb001 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "ヘルプ"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "質問と回答"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "どのように私たちを支持する方法？"; + +/* Button in the main Help dialog */ "copyright" = "著作権"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "バグを報告"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Mapsは、あなたの位置情報をバックグラウンドで使用して最近の走行ルートを記録します。"; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Google Play で評価"; - -/* Share with friends: menu item title */ -"tell_friends" = "友達に教える"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "こんにちは！Organic Maps をインストールしましょう！"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps は旅に必要不可欠なオフラインアプリケーションです。Organic Maps は OpenStreetMap データに基づいており、データを編集することができます。"; +/* About short text */ +"about_description" = "Organic Mapsは無料のアプリケーションです。それは私たちの自由な時間にいくつかのエンジニアによって開発されています。すべての地図データはOpenStreetMapからのものです。広告なし。全く追跡しません。あなたの個人データは収集されません。"; "general_settings" = "一般設定"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index aeebace00d..16767e3f52 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "도움말"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "질문과 답변"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "우리를 지원하는 방법?"; + +/* Button in the main Help dialog */ "copyright" = "저작권"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "오류 신고"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps는 최근 여행한 경로를 녹음하기 위해 배경 화면에서 지역 위치 서비스를 사용합니다."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Google Play에서 평가"; - -/* Share with friends: menu item title */ -"tell_friends" = "친구에게 알려주기"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "안녕하세요! Organic Maps를 설치하세요!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps는 여행용 필수 오프라인 응용 프로그램입니다. Organic Maps는 OpenStreetMap 데이터를 기반으로 하며 이 데이터 편집을 허용합니다."; +/* About short text */ +"about_description" = "Organic Maps는 무료 응용 프로그램입니다. 그것은 자유 시간에 몇 명의 엔지니어가 개발했습니다. 모든지도 데이터는 OpenStreetMap에서입니다. 광고 없음. 추적 없음. 귀하의 개인 데이터는 수집되지 않습니다."; "general_settings" = "일반 설정"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 41f20d6d52..b11bf89437 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Hjelp"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Spørsmål og svar"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Hvordan støtte oss?"; + +/* Button in the main Help dialog */ "copyright" = "Opphavsrett"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Rapporter en feil"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps bruker geografiske funksjoner i bakgrunnen for å registrere din nylig reiste rute."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Gi vurdering på Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Fortell en venn"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hei! Installer Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps er en offline app for reising. Organic Maps bygger på OpenStreetMap-data og tillater redigering av den."; +/* About short text */ +"about_description" = "Organic Maps er en gratis applikasjon. Den er utviklet av noen ingeniører på fritiden. Alle kartdata er fra OpenStreetMap. Ingen annonser. Ingen sporing. Dine personopplysninger er ikke samlet."; "general_settings" = "Generelle innstillinger"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index c9eccfc230..93e2571240 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Hulp"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Vragen en antwoorden"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Hoe ons te steunen?"; + +/* Button in the main Help dialog */ "copyright" = "Auteursrechten"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Meld een fout"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps gebruikt uw geografische positie op de achtergrond om uw onlangs afgelegde route vast te leggen."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Beoordeel op Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Vertel een Vriend"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hallo! Installeer Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps is een essentiële offline applicatie om te reizen. Organic Maps is gebaseerd op OpenStreetMap gegevens en laat bewerking toe."; +/* About short text */ +"about_description" = "Organic Maps is een gratis applicatie. Het is ontwikkeld door een paar ingenieurs in onze vrije tijd. Alle kaartgegevens zijn van OpenStreetMap. Geen advertenties. Geen volgen. Uw persoonlijke gegevens worden niet verzameld."; "general_settings" = "Algemene instellingen"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index 48d672214a..4f955e8aa1 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Pomoc"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Pytania i odpowiedzi"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Jak nas wspierać?"; + +/* Button in the main Help dialog */ "copyright" = "Prawa autorskie"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Zgłoś błąd"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps używa w tle geolokalizacji w celu rejestrowania niedawno przebytej trasy."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Oceń w Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Powiadom znajomego"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Cześć! Zainstaluj Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps to niezbędna aplikacja do podróży działająca w trybie offline. Organic Maps opiera się o dane OpenStreetMap oraz umożliwia ich edycję."; +/* About short text */ +"about_description" = "Organic Maps to darmowa aplikacja. Jest rozwijany przez kilku inżynierów w naszym wolnym czasie. Wszystkie dane mapowe pochodzą z OpenStreetMap. Bez reklam. Bez śledzenia. Twoje dane osobowe nie są gromadzone."; "general_settings" = "Ustawienia ogólne"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index 204e1bd05d..e2709a0068 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Ajuda"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Perguntas e respostas"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "How to support us?"; + +/* Button in the main Help dialog */ "copyright" = "Direitos autorais"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Relatar um problema"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "O Organic Maps usa sua localização geográfica em segundo plano para registrar sua rota recente."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Avaliar em Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Indique a um amigo"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Olá! Instale o Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "O Organic Maps é um aplicativo offline essencial para viajar. O Organic Maps se baseia nos dados do OpenStreetMap e permite editá-los."; +/* About short text */ +"about_description" = "Organic Maps is a free and open-source offline maps app, developed by a few geeks in their free time. All map data is from OpenStreetMap. No ads. No tracking and personal data collection."; "general_settings" = "Definições gerais"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index c529bc5447..8a9b5ba4bb 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Ajuda"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Perguntas e respostas"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Como nos apoiar?"; + +/* Button in the main Help dialog */ "copyright" = "Direitos de autor"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Reportar um problema"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "O Organic Maps usa a sua localização geográfica em segundo plano para gravar a sua rota recente."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Avaliar no Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Indique a um amigo"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Olá! Instale o Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "O Organic Maps é uma aplicação offline essencial para viajar. O Organic Maps baseia-se nos dados do OpenStreetMap e permite editá-los."; +/* About short text */ +"about_description" = "Organic Maps é um aplicativo gratuito. É desenvolvido por alguns engenheiros em nosso tempo livre. Todos os dados do mapa são do OpenStreetMap. Nenhum anúncio. Nenhum rastreamento. Seus dados pessoais não são coletados."; "general_settings" = "Configurações gerais"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 938a83bd11..ff93d77653 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Ajutor"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Intrebari si raspunsuri"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Cum să ne sprijiniți?"; + +/* Button in the main Help dialog */ "copyright" = "Drepturi de autor"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Raportează o eroare"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps folosește în fundal geo-locația pentru a înregistra cel mai recent traseu urmat."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Dați un calificativ pe Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Spuneți unui prieten"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Bună! Instalați Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps este o aplicație offline esențială când călătoriți. Organic Maps utilizează datele OpenStreeMap și permite editarea acestora."; +/* About short text */ +"about_description" = "Organic Maps este o aplicație gratuită. Este dezvoltat de câțiva ingineri în timpul liber. Toate datele hărților sunt din OpenStreetMap. Fără reclame. Nici o urmărire. Datele dvs. personale nu sunt colectate."; "general_settings" = "Setări generale"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index fe79ea60a5..d489510fc4 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Справка"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Вопросы и ответы"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Как наc поддержать?"; + +/* Button in the main Help dialog */ "copyright" = "Копирайт"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Сообщить о проблеме"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps использует вашу геопозицию в фоновом режиме для записи недавно пройденного пути."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Оценить в Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Рассказать друзьям"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Привет! Установи Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps — незаменимое приложение для путешествий, работающее без подключения к интернету. Organic Maps использует данные OpenStreetMap и позволяет их улучшать."; +/* About short text */ +"about_description" = "Organic Maps - это бесплатное приложение, разработанное несколькими гиками свободное временя. Все данные карты из OpenStreetMap. Без рекламы. Нет отслеживания. Ваши личные данные не собираются."; "general_settings" = "Общие настройки"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 3192b032f6..768587293f 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Nápoveda"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Otázky a odpovede"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Ako nás podporiť?"; + +/* Button in the main Help dialog */ "copyright" = "Autorské práva"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Nahlásiť chybu"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps používa vašu geopozíciu na pozadí pre zaznamenávanie vami nedávno precestovanej trasy."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Ohodnotiť v službe Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Povedať priateľovi"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Ahoj! Nainštaluj si aplikáciu Organic Maps"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps je offine aplikácia na cestovanie. Základom aplikácie Organic Maps sú dáta OpenStreetMap, pričom aplikácia nám ich umožňuje upravovať."; +/* About short text */ +"about_description" = "Organic Maps je bezplatná aplikácia. Je vyvinutý niekoľkými inžiniermi v našom voľnom čase. Všetky údaje mapy sú z OpenSTREETMAP. Žiadne reklamy. Žiadne sledovanie. Vaše osobné údaje sa nezbierajú."; "general_settings" = "Všeobecné nastavenia"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 8e49a68225..599f0d9eb4 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Hjälp"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Frågor och svar"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Hur stöder vi oss?"; + +/* Button in the main Help dialog */ "copyright" = "Copyright"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Rapportera en bugg"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps använder din geografiska position i bakgrunden för att spela in din senaste resta rutt."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Betygsätt på Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Tipsa en vän"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Hej! Installera Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps är en offline-applikation som du behöver när du reser. Organic Maps baseras på OpenStreetMap-data och tillåter redigering i den."; +/* About short text */ +"about_description" = "Organic Maps är en gratis applikation. Den är utvecklad av några ingenjörer på vår fritid. Alla kartdata är från OpenStreetMap. Inga annonser. Ingen spårning. Dina personuppgifter samlas inte in."; "general_settings" = "Allmänna inställningar"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 5fa0fc626c..3815dd690a 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "ความช่วยเหลือ"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "คำถามและคำตอบ"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "วิธีการสนับสนุนเรา"; + +/* Button in the main Help dialog */ "copyright" = "ลิขสิทธิ์"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "แจ้งข้อผิดพลาด"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps ใช้ตำแหน่งทางภูมิศาสตร์ของคุณในพื้นหลังเพื่อบันทึกเส้นทางที่คุณเดินทางเมื่อเร็ว ๆ นี้"; -/* Rate on Google Play (Android only) */ -"rate_gp" = "ให้คะแนนบน Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "บอกเพื่อน"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "สวัสดี! ติดตั้ง Organic Maps กันเถอะ!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps เป็นแอปพลิเคชั่นออฟไลน์ที่จำเป็นสำหรับการท่องเที่ยว Organic Maps นั้นใช้งานบนพื้นฐานของข้อมูล OpenStreetMap และใช้แก้ไขได้ด้วย"; +/* About short text */ +"about_description" = "Organic Maps เป็นแอปพลิเคชั่นฟรีมันได้รับการพัฒนาโดยวิศวกรสองสามคนในเวลาว่างของเราข้อมูลแผนที่ทั้งหมดมาจาก OpenStreetMapไม่มีโฆษณาไม่มีการติดตาม. ข้อมูลส่วนบุคคลของคุณจะไม่ถูกเก็บรวบรวม"; "general_settings" = "การตั้งค่าทั่วไป"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index 04fcd90dce..95a14a9d6c 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Yardım"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Sorular ve cevaplar"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Bizi nasıl destekleyebilirim?"; + +/* Button in the main Help dialog */ "copyright" = "Telif hakkı"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Hata bildir"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps, en son seyahat ettiğiniz rotayı kaydetmek için arka planda coğrafi konumunuzu kullanır."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Google Play'de Oy Ver"; - -/* Share with friends: menu item title */ -"tell_friends" = "Arkadaşınıza söyleyin"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Merhaba! Organic Maps'yi hemen yükle!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps, seyahatler için vazgeçilmez bir çevrimdışı uygulamadır. Organic Maps, OpenStreetMap verilerine dayanmakta ve bu verilerin düzenlenmesini sağlamaktadır."; +/* About short text */ +"about_description" = "Organic Maps ücretsiz bir uygulamadır. Boş zamanlarımızda birkaç mühendis tarafından geliştirilmiştir. Tüm harita verileri OpenStreetMap'tendir. Reklamsız. İzleme yok. Kişisel verileriniz toplanmaz."; "general_settings" = "Genel ayarlar"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index b064ccbfe4..227fe4341f 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Допомога"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Питання та відповіді"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Як нас підтримати?"; + +/* Button in the main Help dialog */ "copyright" = "Копірайт"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Сповістити про помилку"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps використовує вашу геопозицію у фоновому режимі для запису нещодавно пройденого шляху."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Рейтинг на Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Розповісти другу"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Привіт! Встанови Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps — це додаток must-have для мандрівників. У Organic Maps використовуються офлайн-дані OpenStreetMap, які можна редагувати."; +/* About short text */ +"about_description" = "Organic Maps - це безкоштовна програма. Він розроблений кількома інженерами у вільний час. Всі дані карти є від OpenStreetMap. Немає реклами. Немає відстеження. Ваші особисті дані не збираються."; "general_settings" = "Загальні налаштування"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index aeb4384e3c..0c792666af 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "Trợ giúp"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "Câu hỏi và trả lời"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "Làm thế nào để hỗ trợ chúng tôi?"; + +/* Button in the main Help dialog */ "copyright" = "Bản quyền"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "Báo cáo lỗi"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps sử dụng định vị của bạn trong ứng dụng chạy nền để ghi lại tuyến đường đã đi gần đây của bạn."; -/* Rate on Google Play (Android only) */ -"rate_gp" = "Cho điểm trên Google Play"; - -/* Share with friends: menu item title */ -"tell_friends" = "Giới thiệu với Bạn bè"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "Xin chào! Hãy cài đặt Organic Maps!"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps là một ứng dụng ngoại tuyến thiết yếu khi đi du lịch. Organic Maps được dựa trên dữ liệu của OpenStreetMap và cho phép bạn hiệu chỉnh nó."; +/* About short text */ +"about_description" = "Organic Maps là một ứng dụng miễn phí. Nó được phát triển bởi một vài kỹ sư trong thời gian rảnh của chúng tôi. Tất cả dữ liệu bản đồ là từ OpenStreetMap. Không quảng cáo. Không theo dõi. Dữ liệu cá nhân của bạn không được thu thập."; "general_settings" = "Thiết lập chung"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index 410416353d..adc30ad403 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "帮助"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "问题和解答"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "如何支持我们？"; + +/* Button in the main Help dialog */ "copyright" = "版权"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "报告漏洞"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps使用背景中的地理位置记录您最近去过的路径。"; -/* Rate on Google Play (Android only) */ -"rate_gp" = "在 Google Play 上的评分"; - -/* Share with friends: menu item title */ -"tell_friends" = "告诉朋友"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "您好！安装 Organic Maps！"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps 是一款基本的离线旅行应用。Organic Maps 基于 OpenStreetMap 数据并且允许对其进行编辑。"; +/* About short text */ +"about_description" = "Organic Maps是免费的申请。它是由我们的空闲时间的少数工程师开发的。所有地图数据都来自OpenStreetMap。无广告。没有跟踪。您的个人数据不会收集。"; "general_settings" = "常规设置"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index bb1e1b80b9..2bf62b91b2 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -381,10 +381,16 @@ /* Text in menu */ "help" = "幫助"; -/* Text in menu */ +/* Button in the main Help dialog */ +"faq" = "問題和解答"; + +/* Button in the main Help dialog */ +"how_to_support_us" = "如何支持我們？"; + +/* Button in the main Help dialog */ "copyright" = "版權"; -/* Text in menu */ +/* Text in menu + Button in the main Help dialog */ "report_a_bug" = "報告錯誤"; /* Alert text */ @@ -996,17 +1002,8 @@ "recent_track_background_dialog_message" = "Organic Maps使用背景中的地理位置記錄您最近去過的路徑。"; -/* Rate on Google Play (Android only) */ -"rate_gp" = "在 Google Play 評分"; - -/* Share with friends: menu item title */ -"tell_friends" = "告訴朋友"; - -/* Share with friends: sharing text */ -"tell_friends_text" = "嗨！安裝 Organic Maps！"; - -/* About short text (below logo) */ -"about_description" = "Organic Maps 是一款基本離線旅遊應用程式。Organic Maps 以 OpenStreetMap 數據為基礎，並允許對其進行編輯。"; +/* About short text */ +"about_description" = "Organic Maps是免費的申請。它是由我們的空閒時間的少數工程師開發的。所有地圖數據都來自OpenStreetMap。無廣告。沒有跟踪。您的個人數據不會收集。"; "general_settings" = "一般設定";