Osm login finalization. Login validation implemented.
This commit is contained in:
GaidamakUA
parent
c7fbf8387d
commit
9211eebe81
48 changed files with 87 additions and 56 deletions
|
|
@ -231,7 +231,7 @@
|
|||
<string name="general_settings_descr">Instel van oorhoofse verstellings</string>
|
||||
<string name="global_app_settings">oorhoofse toepassing instellings</string>
|
||||
<string name="user_name">Jou OSM gebruiker naam</string>
|
||||
<string name="user_name_descr">Vereis vir openstreetmap.org voorleggings</string>
|
||||
<string name="open_street_map_login_descr">Vereis vir openstreetmap.org voorleggings</string>
|
||||
<string name="user_password">Jou OSM wagwoord</string>
|
||||
<string name="user_password_descr">Vereis vir openstreetmap.org voorleggings</string>
|
||||
<string name="osmand_service">Sluimertoestand Funksionaliteit</string>
|
||||
|
|
|
|||
|
|
@ -554,7 +554,7 @@
|
|||
<string name="index_settings">إدارة بيانات الخرائط</string>
|
||||
<string name="general_settings">عام</string>
|
||||
<string name="general_settings_descr">ضبط العرض وإعدادات عامة للتطبيق</string>
|
||||
<string name="user_name_descr">مطلوب للمساهمة في openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">مطلوب للمساهمة في openstreetmap.org</string>
|
||||
<string name="user_password_descr">مطلوبة للمساهمة في openstreetmap.org</string>
|
||||
<string name="local_openstreetmap_uploading">يرفع …</string>
|
||||
<string name="local_openstreetmap_uploadall">رفع الكل</string>
|
||||
|
|
|
|||
|
|
@ -998,7 +998,7 @@
|
|||
<string name="general_settings_descr">Nalady ekranu і ahuĺnyja nalady prahramy</string>
|
||||
<string name="global_app_settings">Ahuĺnyja nalady prahramy</string>
|
||||
<string name="user_name">Vašaje іmia karystaĺnіka OSM</string>
|
||||
<string name="user_name_descr">Patrebna dlia pradstaŭlieńnia ŭ openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Patrebna dlia pradstaŭlieńnia ŭ openstreetmap.org</string>
|
||||
<string name="user_password">Vaš paroĺ OSM</string>
|
||||
<string name="user_password_descr">Patrebna dlia pradstaŭlieńnia ŭ openstreetmap.org</string>
|
||||
<string name="osmand_service">Fonavy režym</string>
|
||||
|
|
|
|||
|
|
@ -547,7 +547,7 @@
|
|||
<string name="general_settings_descr">Налады экрану і агульныя налады праграмы</string>
|
||||
<string name="global_app_settings">Агульныя налады праграмы</string>
|
||||
<string name="user_name">Вашае імя карыстальніка OSM</string>
|
||||
<string name="user_name_descr">Патрэбна для прадстаўленьня ў openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Патрэбна для прадстаўленьня ў openstreetmap.org</string>
|
||||
<string name="user_password">Ваш пароль OSM</string>
|
||||
<string name="user_password_descr">Патрэбна для прадстаўленьня ў openstreetmap.org</string>
|
||||
<string name="osmand_service">Фонавы рэжым</string>
|
||||
|
|
|
|||
|
|
@ -528,7 +528,7 @@
|
|||
<string name="general_settings_descr">Настройване на екрана и общите настройки на приложението</string>
|
||||
<string name="global_app_settings">Общи настройки на приложението</string>
|
||||
<string name="user_name">Вашето потребителско име в OSM</string>
|
||||
<string name="user_name_descr">Необходимо за изпращане към openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Необходимо за изпращане към openstreetmap.org</string>
|
||||
<string name="user_password">Вашата парола в OSM</string>
|
||||
<string name="user_password_descr">Необходима за изпращане на данни към openstreetmap.org</string>
|
||||
<string name="osmand_service">Фонов режим</string>
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@
|
|||
<string name="native_app_allocated_memory_descr">Memòria nativa total assignada a l\'aplicació %1$s MB (Dalvik %2$s MB, altres %3$s MB). Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</string>
|
||||
<string name="switch_to_raster_map_to_see">No s\'ha trobat cap mapa de vectors fora de línia per aquesta localització. Podeu baixar-ne un a Configuració (Gestió de fitxers de mapes) o canviar per utilitzar mapes en línia (cal activar el connector de mapes en línia per fer-ho).</string>
|
||||
<string name="global_app_settings">Paràmetres globals de l\'aplicació</string>
|
||||
<string name="user_name_descr">És necessari per a les trameses a openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">És necessari per a les trameses a openstreetmap.org</string>
|
||||
<string name="user_password_descr">És necessària per a les trameses a openstreetmap.org</string>
|
||||
<string name="old_poi_file_should_be_deleted">El fitxer de dades de PDI «%1$s» és redundant i serà suprimit.</string>
|
||||
<string name="search_position_favorites">Preferits…</string>
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
<string name="general_settings">Obecné</string>
|
||||
<string name="general_settings_descr">Nastavení displeje, jazyka, zvuku a dalších parametrů</string>
|
||||
<string name="user_name">Jméno uživatele</string>
|
||||
<string name="user_name_descr">Vaše uživatelské jméno na openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Vaše uživatelské jméno na openstreetmap.org</string>
|
||||
<string name="user_password">Heslo</string>
|
||||
<string name="user_password_descr">Vaše heslo na openstreetmap.org</string>
|
||||
<string name="osmand_service">Služba na pozadí</string>
|
||||
|
|
|
|||
|
|
@ -432,7 +432,7 @@
|
|||
<string name="general_settings_descr">Konfigurer visning og generelle indstillinger</string>
|
||||
<string name="global_app_settings">Globale programindstillinger</string>
|
||||
<string name="user_name">OSM-brugernavn</string>
|
||||
<string name="user_name_descr">Nødvendige for ændringer i openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Nødvendige for ændringer i openstreetmap.org</string>
|
||||
<string name="user_password">OSM-kodeord</string>
|
||||
<string name="user_password_descr">Nødvendig for ændringer i openstreetmap.org</string>
|
||||
<string name="osmand_service">Kørsel i baggrunden</string>
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ Für Hilfe mit der OsmAnd-App kontaktieren Sie bitte unser Support-Team unter su
|
|||
<string name="general_settings_descr">Konfiguration der Anzeige und anderer allgemeiner Einstellungen</string>
|
||||
<string name="global_app_settings">Globale Einstellungen</string>
|
||||
<string name="user_name">OSM-Benutzername</string>
|
||||
<string name="user_name_descr">Benötigt für openstreetmap.org-Beiträge</string>
|
||||
<string name="open_street_map_login_descr">Benötigt für openstreetmap.org-Beiträge</string>
|
||||
<string name="user_password">OSM-Kennwort</string>
|
||||
<string name="user_password_descr">Benötigt für openstreetmap.org-Beiträge</string>
|
||||
<string name="osmand_service">Hintergrunddienst</string>
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@
|
|||
<string name="general_settings_descr">Διαμόρφωση οθόνης και κοινές ρυθμίσεις για την εφαρμογή</string>
|
||||
<string name="global_app_settings">Καθολικές ρυθμίσεις εφαρμογής</string>
|
||||
<string name="user_name">Όνομα χρήστη OSM</string>
|
||||
<string name="user_name_descr">Απαιτείται για υποβολές στο openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Απαιτείται για υποβολές στο openstreetmap.org</string>
|
||||
<string name="user_password">Κωδικός OSM</string>
|
||||
<string name="user_password_descr">Απαιτείται για υποβολές στο openstreetmap.org</string>
|
||||
<string name="osmand_service">Κατάσταση νάρκης</string>
|
||||
|
|
|
|||
|
|
@ -1203,7 +1203,7 @@
|
|||
<string name="general_settings_descr">Configura la presentación y otros ajustes globales</string>
|
||||
<string name="global_app_settings">Ajustes globales de la aplicación</string>
|
||||
<string name="user_name">Su usuario de OSM</string>
|
||||
<string name="user_name_descr">Necesario para envíos a OpenStreetMap.org</string>
|
||||
<string name="open_street_map_login_descr">Necesario para envíos a OpenStreetMap.org</string>
|
||||
<string name="user_password">Su clave de OSM</string>
|
||||
<string name="user_password_descr">Necesario para envíos a OpenStreetMap.org</string>
|
||||
<string name="osmand_service">Modo reposo</string>
|
||||
|
|
|
|||
|
|
@ -1203,7 +1203,7 @@
|
|||
<string name="general_settings_descr">Configura la presentación y otros ajustes globales</string>
|
||||
<string name="global_app_settings">Ajustes globales de la aplicación</string>
|
||||
<string name="user_name">Su usuario de OSM</string>
|
||||
<string name="user_name_descr">Necesario para envíos a OpenStreetMap.org</string>
|
||||
<string name="open_street_map_login_descr">Necesario para envíos a OpenStreetMap.org</string>
|
||||
<string name="user_password">Su clave de OSM</string>
|
||||
<string name="user_password_descr">Necesario para envíos a OpenStreetMap.org</string>
|
||||
<string name="osmand_service">Modo reposo</string>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
<string name="general_settings_descr">Configura la presentación y otros ajustes comunes para la aplicación</string>
|
||||
<string name="global_app_settings">Ajustes globales de la aplicación</string>
|
||||
<string name="user_name">Su usuario OSM</string>
|
||||
<string name="user_name_descr">Necesario para envíos a openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Necesario para envíos a openstreetmap.org</string>
|
||||
<string name="user_password">Su clave OSM</string>
|
||||
<string name="user_password_descr">Necesario para envíos a openstreetmap.org</string>
|
||||
<string name="osmand_service">Modo en segundo plano</string>
|
||||
|
|
|
|||
|
|
@ -550,7 +550,7 @@
|
|||
<string name="general_settings_descr">Konfiguratu bistaratzea eta aplikazioaren ezarpen komunak</string>
|
||||
<string name="global_app_settings">Aplikazioaren ezarpen globalak</string>
|
||||
<string name="user_name">Zure OSMeko erabiltzailea</string>
|
||||
<string name="user_name_descr">Beharrezkoa openstreetmap.org-eko bidalketentzat</string>
|
||||
<string name="open_street_map_login_descr">Beharrezkoa openstreetmap.org-eko bidalketentzat</string>
|
||||
<string name="user_password">Zure OSMeko pasahitza</string>
|
||||
<string name="user_password_descr">Beharrezkoa openstreetmap.org-eko bidalketentzat</string>
|
||||
<string name="osmand_service">Esekite moduko funtzionalitatea</string>
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@
|
|||
<string name="general_settings_descr">تعیین نحوه نمایش و تنظیمات کلی برنامه</string>
|
||||
<string name="global_app_settings">تنظیمات کلی برنامه</string>
|
||||
<string name="user_name">نام کاربری سایت OSM شما</string>
|
||||
<string name="user_name_descr">جهت پذیرش در سایت openstreetmap.org مورد نیاز است</string>
|
||||
<string name="open_street_map_login_descr">جهت پذیرش در سایت openstreetmap.org مورد نیاز است</string>
|
||||
<string name="user_password">رمز عبور سایت OSM شما</string>
|
||||
<string name="user_password_descr">جهت پذیرش در سایت openstreetmap.org مورد نیاز است</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@
|
|||
<string name="general_settings_descr">Konfiguroi globaalit asetukset</string>
|
||||
<string name="global_app_settings">Globaalit sovellusasetukset</string>
|
||||
<string name="user_name">OSM käyttäjänimesi</string>
|
||||
<string name="user_name_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string>
|
||||
<string name="open_street_map_login_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string>
|
||||
<string name="user_password">OSM salasanasi</string>
|
||||
<string name="user_password_descr">Tarvitaan openstreetmap.org ehdotuksia varten</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
<string name="general_settings_descr">Configurer l\'affichage et les paramètres généraux de l\'application</string>
|
||||
<string name="global_app_settings">Paramètres globaux de l\'application</string>
|
||||
<string name="user_name">Votre identifiant OSM</string>
|
||||
<string name="user_name_descr">Nécessaire pour les contributions openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Nécessaire pour les contributions openstreetmap.org</string>
|
||||
<string name="user_password">Votre mot de passe OSM</string>
|
||||
<string name="user_password_descr">Nécessaire pour les contributions openstreetmap.org</string>
|
||||
<string name="osmand_service">Mode tâche de fond</string>
|
||||
|
|
|
|||
|
|
@ -926,7 +926,7 @@
|
|||
<string name="general_settings_descr">Configurar as opcións de visualización e comúns do aplicativo</string>
|
||||
<string name="global_app_settings">Configuración global do aplicativo</string>
|
||||
<string name="user_name">O seu nome de usuario en OSM</string>
|
||||
<string name="user_name_descr">Precísase para os envíos a openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Precísase para os envíos a openstreetmap.org</string>
|
||||
<string name="user_password">O seu contrasinal en OSM</string>
|
||||
<string name="user_password_descr">Precísase para os envíos a openstreetmap.org</string>
|
||||
<string name="osmand_service">Modo de segundo plano</string>
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@
|
|||
<string name="general_settings_descr">הגדרת תצורה כללית</string>
|
||||
<string name="global_app_settings">הגדרות יישומים כלליות</string>
|
||||
<string name="user_name">שם המשתמש שלך ב־OSM</string>
|
||||
<string name="user_name_descr">נדרש לטובת שליחת נתונים אל openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">נדרש לטובת שליחת נתונים אל openstreetmap.org</string>
|
||||
<string name="user_password_descr">נדרש לטובת שליחת נתונים אל openstreetmap.org</string>
|
||||
<string name="user_password">הססמה שלך ב־OSM</string>
|
||||
<string name="osmand_service">תכונת מצב השינה</string>
|
||||
|
|
|
|||
|
|
@ -818,7 +818,7 @@
|
|||
<string name="user_password">Vaša OSM lozinka</string>
|
||||
<string name="osmand_service">Mogućnosti stanja mirovanja</string>
|
||||
<string name="osmand_service_descr">Koristite za pokretanje OsmAnd-a dok je zaslon isključen</string>
|
||||
<string name="user_name_descr">To je potrebno za prijenos podataka na openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">To je potrebno za prijenos podataka na openstreetmap.org</string>
|
||||
<string name="user_password_descr">To je potrebno za prijenos podataka na openstreetmap.org</string>
|
||||
<string name="user_name">Vaše OSM korisničko ime</string>
|
||||
<string name="global_app_settings">Opće postavke aplikacije</string>
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
<string name="general_settings_descr">Kijelző és más általános beállítások</string>
|
||||
<string name="global_app_settings">Globális beállítások az alkalmazáshoz</string>
|
||||
<string name="user_name">OSM felhasználóneved</string>
|
||||
<string name="user_name_descr">openstreetmap.org felé történő adatküldéshez szükséges</string>
|
||||
<string name="open_street_map_login_descr">openstreetmap.org felé történő adatküldéshez szükséges</string>
|
||||
<string name="user_password">OSM jelszavad</string>
|
||||
<string name="user_password_descr">openstreetmap.org felé történő adatküldéshez szükséges</string>
|
||||
<string name="osmand_service">Háttér mód</string>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
<string name="general_settings_descr">Configura le impostazioni globali</string>
|
||||
<string name="global_app_settings">Impostazioni globali dell\'applicazione</string>
|
||||
<string name="user_name">Nome utente in OSM</string>
|
||||
<string name="user_name_descr">Necessario per inviare contributi a openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Necessario per inviare contributi a openstreetmap.org</string>
|
||||
<string name="user_password">Password in OSM</string>
|
||||
<string name="user_password_descr">Necessaria per inviare contributi a openstreetmap.org</string>
|
||||
<string name="osmand_service">"Modalità backgraund"</string>
|
||||
|
|
|
|||
|
|
@ -469,7 +469,7 @@ POIの更新は利用できません</string>
|
|||
<string name="save_track_to_gpx">ナビゲーション中に経路ログをGPXに記録</string>
|
||||
<string name="update_tile">マップを更新</string>
|
||||
<string name="reload_tile">タイルをリロード</string>
|
||||
<string name="user_name_descr">あなたのOSM ユーザー名を入力します</string>
|
||||
<string name="open_street_map_login_descr">あなたのOSM ユーザー名を入力します</string>
|
||||
<string name="user_name">OSM ユーザー名</string>
|
||||
<string name="mark_point">ターゲット</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@
|
|||
<string name="general_settings_descr">მთავარი პარამეტრების გამართვა</string>
|
||||
<string name="global_app_settings">აპლიკაციის მთავარი პარამეტრები</string>
|
||||
<string name="user_name">თქვენი OSM-ს მომხმარებლის სახელი</string>
|
||||
<string name="user_name_descr">საჭიროა openstreetmap.org-ზე ოპერაციებისათვის</string>
|
||||
<string name="open_street_map_login_descr">საჭიროა openstreetmap.org-ზე ოპერაციებისათვის</string>
|
||||
<string name="user_password">თქვენი OSM-ს პაროლი</string>
|
||||
<string name="user_password_descr">საჭიროა openstreetmap.org-ზე ოპერაციებისათვის</string>
|
||||
<string name="osmand_service">ფონური პარამეტრები</string>
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
<string name="general_settings_descr">앱에 대한 디스플레이와 일반 설정을 구성합니다</string>
|
||||
<string name="global_app_settings">일반 앱 설정</string>
|
||||
<string name="user_name">OSM 사용자 이름</string>
|
||||
<string name="user_name_descr">http://openstreetmap.org 에 데이터 제출을 위해 필요합니다</string>
|
||||
<string name="open_street_map_login_descr">http://openstreetmap.org 에 데이터 제출을 위해 필요합니다</string>
|
||||
<string name="user_password">OSM 패스워드</string>
|
||||
<string name="user_password_descr">http://openstreetmap.org 에 데이터를 제출하기 위해 필요합니다</string>
|
||||
<string name="osmand_service">절전 모드</string>
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@
|
|||
<string name="general_settings_descr">Derinkite globaliuosius nustatymus</string>
|
||||
<string name="global_app_settings">Globalūs programos nustatymai</string>
|
||||
<string name="user_name">Jūsų OSM vartotojo vardas</string>
|
||||
<string name="user_name_descr">Reikalingas norint teikti duomenis į openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Reikalingas norint teikti duomenis į openstreetmap.org</string>
|
||||
<string name="user_password">Jūsų OSM slaptažodis</string>
|
||||
<string name="user_password_descr">Reikalingas norint teikti duomenis į openstreetmap.org</string>
|
||||
<string name="osmand_service">Foninis režimas</string>
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
<string name="general_settings_descr">Mainīt aplikācijas uzstādījumus</string>
|
||||
<string name="global_app_settings">Vispārīgie uzstādījumi</string>
|
||||
<string name="user_name">OSM lietotāja vārds</string>
|
||||
<string name="user_name_descr">Nepieciešams, lai veiktu augšupielādes openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Nepieciešams, lai veiktu augšupielādes openstreetmap.org</string>
|
||||
<string name="user_password">Jūsu OSM parole</string>
|
||||
<string name="user_password_descr">Nepieciešams, lai veiktu openstreetmap.org augšuplādi</string>
|
||||
<string name="osmand_service">Miega režīms</string>
|
||||
|
|
|
|||
|
|
@ -1135,7 +1135,7 @@
|
|||
|
||||
|
||||
<string name="anonymous_user">Anonym bruker</string>
|
||||
<string name="user_name_descr">Trengs for bidrag til openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Trengs for bidrag til openstreetmap.org</string>
|
||||
<string name="user_password_descr">Trengs for bidrag til openstreetmap.org</string>
|
||||
<string name="download_files_not_enough_space">Det er ikke nok ledig plass til å laste ned %1$s MB (ledig: %2$s).</string>
|
||||
<string name="download_files_question_space">Laste ned {0} fil(er)? Dette krever {1} MB permanent. Nå er det {2} MB tilgjengelig.</string>
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@
|
|||
<string name="general_settings_descr">Kaartweergave en algemene instellingen</string>
|
||||
<string name="global_app_settings">Algemene instellingen</string>
|
||||
<string name="user_name">OSM gebruikersnaam</string>
|
||||
<string name="user_name_descr">Nodig voor OpenStreetMap.org aanmelding</string>
|
||||
<string name="open_street_map_login_descr">Nodig voor OpenStreetMap.org aanmelding</string>
|
||||
<string name="user_password">OSM wachtwoord</string>
|
||||
<string name="user_password_descr">Nodig voor OpenStreetMap.org aanmelding</string>
|
||||
<string name="osmand_service">Achtergrondmodus</string>
|
||||
|
|
|
|||
|
|
@ -493,7 +493,7 @@
|
|||
<string name="save_track_to_gpx">Zapisywanie śladu do pliku GPX podczas nawigacji</string>
|
||||
<string name="update_tile">Uaktualnij mapę</string>
|
||||
<string name="reload_tile">Wczytaj ponownie kafelki</string>
|
||||
<string name="user_name_descr">Wymagane do wysyłania danych na openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Wymagane do wysyłania danych na openstreetmap.org</string>
|
||||
<string name="user_name">Nazwa użytkownika OSM</string>
|
||||
<string name="mark_point">Cel</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -1122,7 +1122,7 @@
|
|||
<string name="general_settings_descr">Configurar exibição e configurações comuns para o aplicativo</string>
|
||||
<string name="global_app_settings">Configurações globais do aplicativo</string>
|
||||
<string name="user_name">Seu nome de usuário OSM</string>
|
||||
<string name="user_name_descr">Necessário para envios ao openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Necessário para envios ao openstreetmap.org</string>
|
||||
<string name="user_password">Sua senha do OSM</string>
|
||||
<string name="user_password_descr">Necessária para envios ao openstreetmap.org</string>
|
||||
<string name="osmand_service">Modo em segundo plano</string>
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@
|
|||
<string name="save_track_to_gpx">salvar trilha GPX durante a navegação</string>
|
||||
<string name="update_tile">Atualizar mapa</string>
|
||||
<string name="reload_tile">Atualizar imagens</string>
|
||||
<string name="user_name_descr">Nome do usuário OpenStreetMap</string>
|
||||
<string name="open_street_map_login_descr">Nome do usuário OpenStreetMap</string>
|
||||
<string name="user_name">Nome do usuário</string>
|
||||
<string name="mark_point">Destino</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@
|
|||
<string name="general_settings_descr">Configurarea setărilor globale</string>
|
||||
<string name="global_app_settings">Setări globale aplicație</string>
|
||||
<string name="user_name">Numele de utilizator OSM</string>
|
||||
<string name="user_name_descr">Necesar pentru trimiterea de date la openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Necesar pentru trimiterea de date la openstreetmap.org</string>
|
||||
<string name="user_password">Parola OSM</string>
|
||||
<string name="user_password_descr">Necesară pentru trimiterea de date la openstreetmap.org</string>
|
||||
<string name="osmand_service">Mod standby</string>
|
||||
|
|
|
|||
|
|
@ -603,7 +603,7 @@
|
|||
<string name="save_track_to_gpx">Запись трека в файл GPX во время навигации</string>
|
||||
<string name="update_tile">Обновить карту</string>
|
||||
<string name="reload_tile">Обновить часть карты</string>
|
||||
<string name="user_name_descr">Укажите имя пользователя (требуется для работы с OSM)</string>
|
||||
<string name="open_street_map_login_descr">Укажите имя пользователя (требуется для работы с OSM)</string>
|
||||
<string name="user_name">Имя пользователя</string>
|
||||
<string name="mark_point">Цель</string>
|
||||
<string name="use_english_names_descr">Использовать английские названия вместо местных</string>
|
||||
|
|
|
|||
|
|
@ -941,7 +941,7 @@
|
|||
<string name="amenity_type_user_defined">Definidu dae s’impitadore</string>
|
||||
<string name="fav_export_confirmation">Esistint documentos cun preferidos esportados giai. Los boles remplasare?</string>
|
||||
<string name="index_settings">Amministra sos documentos de sas mapas</string>
|
||||
<string name="user_name_descr">Netzessàriu pro imbiare contributos a openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Netzessàriu pro imbiare contributos a openstreetmap.org</string>
|
||||
<string name="user_password_descr">Netzessària pro imbiare contributos a openstreetmap.org</string>
|
||||
<string name="osmand_service">Modalidade de isfundu</string>
|
||||
<string name="osmand_service_descr">OsmAnd funtzionat in s’isfundu, cun s’ischermu mortu</string>
|
||||
|
|
|
|||
|
|
@ -626,7 +626,7 @@
|
|||
<string name="save_track_to_gpx">Logovať stopu do GPX súboru počas navigácie</string>
|
||||
<string name="update_tile">Aktualizovať mapu</string>
|
||||
<string name="reload_tile">Znovu načítať dlaždicu</string>
|
||||
<string name="user_name_descr">Meno potrebné pre prispievanie do openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Meno potrebné pre prispievanie do openstreetmap.org</string>
|
||||
<string name="user_name">OSM používateľské meno</string>
|
||||
<string name="mark_point">Cieľ</string>
|
||||
<string name="use_english_names_descr">Výber medzi domácimi a anglickými názvami</string>
|
||||
|
|
|
|||
|
|
@ -280,7 +280,7 @@
|
|||
<string name="routing_settings">Navigacija</string>
|
||||
<string name="user_name">Uporabniško ime OSM</string>
|
||||
<string name="user_password">Geslo OSM</string>
|
||||
<string name="user_name_descr">Zahtevano za pošiljanje podatkov na strežnik openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Zahtevano za pošiljanje podatkov na strežnik openstreetmap.org</string>
|
||||
<string name="user_password_descr">Zahtevano za pošiljanje podatkov na openstreetmap.org</string>
|
||||
<string name="routing_settings_descr">Prilagajanje možnosti za določevanje poti in navigacijo</string>
|
||||
<string name="general_settings">Splošne nastavitve</string>
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@
|
|||
<string name="general_settings_descr">Konfigurera globala inställningar</string>
|
||||
<string name="global_app_settings">Globala inställningar</string>
|
||||
<string name="user_name">Ditt OSM-användarnamn</string>
|
||||
<string name="user_name_descr">Behövs för ändringar i openstreetmap.org</string>
|
||||
<string name="open_street_map_login_descr">Behövs för ändringar i openstreetmap.org</string>
|
||||
<string name="user_password">Ditt OSM-lösenord</string>
|
||||
<string name="user_password_descr">Behövs för ändringar i openstreetmap.org</string>
|
||||
<string name="osmand_service">Bakgrundsläge</string>
|
||||
|
|
|
|||
|
|
@ -631,7 +631,7 @@
|
|||
<string name="general_settings_descr">Uygulama için ekran ve ortak ayarları yapılandırma</string>
|
||||
<string name="global_app_settings">Genel uygulama ayarları</string>
|
||||
<string name="user_name">OSM kullanıcı adınız</string>
|
||||
<string name="user_name_descr">Openstreetmap.org gönderimler için gereklidir</string>
|
||||
<string name="open_street_map_login_descr">Openstreetmap.org gönderimler için gereklidir</string>
|
||||
<string name="user_password_descr">Openstreetmap.org gönderimler için gereklidir</string>
|
||||
<string name="osmand_service">Arka plan modu</string>
|
||||
<string name="osmand_service_descr">Ekran kapalı iken Osmand arka planda çalışır</string>
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@
|
|||
<string name="general_settings_descr">Налаштування екрану, локалізації, одиниці вимірювання тощо</string>
|
||||
<string name="global_app_settings">Загальні налаштування</string>
|
||||
<string name="user_name">Ім’я користувача</string>
|
||||
<string name="user_name_descr">Вкажіть ім’я користувача для роботи з OSM</string>
|
||||
<string name="open_street_map_login_descr">Вкажіть ім’я користувача для роботи з OSM</string>
|
||||
<string name="user_password">Пароль</string>
|
||||
<string name="user_password_descr">Потрібно для роботи з openstreetmap.org</string>
|
||||
<string name="osmand_service">Фоновий режим</string>
|
||||
|
|
|
|||
|
|
@ -518,7 +518,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com -->
|
|||
<string name="save_track_to_gpx">Lưu track thành GPX</string>
|
||||
<string name="update_tile">Cập nhật bản đồ</string>
|
||||
<string name="reload_tile">Tải lại tile</string>
|
||||
<string name="user_name_descr">Tài khoản tại OpenStreetMap.org (OSM)</string>
|
||||
<string name="open_street_map_login_descr">Tài khoản tại OpenStreetMap.org (OSM)</string>
|
||||
<string name="user_name">Tài khoản OSM</string>
|
||||
<string name="mark_point">Mục tiêu</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@
|
|||
<string name="global_settings">全局设置</string>
|
||||
<string name="general_settings">一般</string>
|
||||
<string name="user_name">你的OSM用户名</string>
|
||||
<string name="user_name_descr">为提交openstreetmap.org需要</string>
|
||||
<string name="open_street_map_login_descr">为提交openstreetmap.org需要</string>
|
||||
<string name="user_password">您的OSM密码</string>
|
||||
<string name="user_password_descr">为提交openstreetmap.org需要</string>
|
||||
<string name="osmand_service">睡眠模式功能</string>
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@
|
|||
<string name="general_settings_descr">組態應用程式顯示和共通設定</string>
|
||||
<string name="global_app_settings">整體程式設定</string>
|
||||
<string name="user_name">您 OSM 的使用者名稱</string>
|
||||
<string name="user_name_descr">需要在 openstreetmap.org 註冊</string>
|
||||
<string name="open_street_map_login_descr">需要在 openstreetmap.org 註冊</string>
|
||||
<string name="user_password">您 OSM 的密碼</string>
|
||||
<string name="user_password_descr">需要在 openstreetmap.org 註冊</string>
|
||||
<string name="osmand_service">背景模式</string>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
<string name="storage_directory_shared">Shared memory</string>
|
||||
<string name="shared_string_topbar">Topbar</string>
|
||||
<string name="recalculate_route">Recalculate route</string>
|
||||
<string name="open_street_map_login_and_pass">OpenStreetMap login and password</string>
|
||||
<string name="donations">Donations</string>
|
||||
<string name="number_of_recipients">Number of recipients</string>
|
||||
<string name="osm_user_stat">Edits %1$s, rank %2$s, total edits %3$s</string>
|
||||
|
|
@ -1661,9 +1662,8 @@ If you need help with OsmAnd application, please contact our support team: suppo
|
|||
<string name="general_settings_descr">Configure display and common settings for the application</string>
|
||||
<string name="global_app_settings">Global app settings</string>
|
||||
<string name="user_name">Your OSM user name</string>
|
||||
<string name="user_name_descr">Needed for openstreetmap.org submissions</string>
|
||||
<string name="open_street_map_login_descr">Needed for openstreetmap.org submissions</string>
|
||||
<string name="user_password">Your OSM password</string>
|
||||
<string name="user_password_descr">Needed for openstreetmap.org submissions</string>
|
||||
<string name="osmand_service">Background mode</string>
|
||||
<string name="osmand_service_descr">OsmAnd runs in background while screen is off</string>
|
||||
<string name="download_files_not_enough_space">There is not enough free space to download %1$s MB (free: %2$s).</string>
|
||||
|
|
|
|||
|
|
@ -826,7 +826,7 @@ public class OsmandSettings {
|
|||
}
|
||||
|
||||
// this value string is synchronized with settings_pref.xml preference name
|
||||
public final OsmandPreference<String> USER_NAME = new StringPreference("user_name", "NoName").makeGlobal();
|
||||
public final OsmandPreference<String> USER_NAME = new StringPreference("user_name", "").makeGlobal();
|
||||
|
||||
public final OsmandPreference<String> BILLING_USER_ID = new StringPreference("billing_user_id", "").makeGlobal();
|
||||
public final OsmandPreference<String> BILLING_USER_NAME = new StringPreference("billing_user_name", "").makeGlobal();
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public class OsmBugsRemoteUtil implements OsmBugsUtil {
|
|||
throw new RuntimeException(e);
|
||||
}
|
||||
if (!anonymous) {
|
||||
OsmBugResult loginResult = editingPOI(getUserDetailsApi(), GET, "validate_login");
|
||||
OsmBugResult loginResult = validateLoginDetails();
|
||||
if (loginResult.warning != null) {
|
||||
return loginResult;
|
||||
}
|
||||
|
|
@ -98,6 +98,10 @@ public class OsmBugsRemoteUtil implements OsmBugsUtil {
|
|||
return editingPOI(b.toString(), POST, msg);
|
||||
}
|
||||
|
||||
public OsmBugResult validateLoginDetails() {
|
||||
return editingPOI(getUserDetailsApi(), GET, "validate_login");
|
||||
}
|
||||
|
||||
private OsmBugResult editingPOI(String url, String requestMethod, String userOperation) {
|
||||
OsmBugResult r = new OsmBugResult();
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -47,12 +47,12 @@ public class OsmEditingPlugin extends OsmandPlugin {
|
|||
private static final String ID = "osm.editing";
|
||||
private OsmandSettings settings;
|
||||
private OsmandApplication app;
|
||||
OpenstreetmapsDbHelper dbpoi;
|
||||
OsmBugsDbHelper dbbug;
|
||||
OpenstreetmapLocalUtil localUtil;
|
||||
OpenstreetmapRemoteUtil remoteUtil;
|
||||
OsmBugsRemoteUtil remoteNotesUtil;
|
||||
OsmBugsLocalUtil localNotesUtil;
|
||||
private OpenstreetmapsDbHelper dbpoi;
|
||||
private OsmBugsDbHelper dbbug;
|
||||
private OpenstreetmapLocalUtil localUtil;
|
||||
private OpenstreetmapRemoteUtil remoteUtil;
|
||||
private OsmBugsRemoteUtil remoteNotesUtil;
|
||||
private OsmBugsLocalUtil localNotesUtil;
|
||||
|
||||
public OsmEditingPlugin(OsmandApplication app) {
|
||||
this.app = app;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package net.osmand.plus.osmedit;
|
|||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.preference.CheckBoxPreference;
|
||||
import android.preference.DialogPreference;
|
||||
|
|
@ -12,9 +13,11 @@ import android.preference.PreferenceScreen;
|
|||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import net.osmand.plus.OsmAndAppCustomization;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.SettingsBaseActivity;
|
||||
|
||||
|
|
@ -26,6 +29,7 @@ public class SettingsOsmEditingActivity extends SettingsBaseActivity {
|
|||
((OsmandApplication) getApplication()).applyTheme(this);
|
||||
super.onCreate(savedInstanceState);
|
||||
getToolbar().setTitle(R.string.osm_settings);
|
||||
@SuppressWarnings("deprecation")
|
||||
PreferenceScreen grp = getPreferenceScreen();
|
||||
|
||||
DialogPreference loginDialogPreference = new OsmLoginDataDialogPreference(this, null);
|
||||
|
|
@ -64,10 +68,10 @@ public class SettingsOsmEditingActivity extends SettingsBaseActivity {
|
|||
setDialogLayoutResource(R.layout.osm_user_login_details);
|
||||
setPositiveButtonText(android.R.string.ok);
|
||||
setNegativeButtonText(android.R.string.cancel);
|
||||
setDialogTitle("OSM Login user details");
|
||||
setDialogTitle(R.string.open_street_map_login_and_pass);
|
||||
|
||||
setTitle("OSM Login user details");
|
||||
setSummary("Needed for openstreetmap.org submissions");
|
||||
setTitle(R.string.open_street_map_login_and_pass);
|
||||
setSummary(R.string.open_street_map_login_descr);
|
||||
|
||||
setDialogIcon(null);
|
||||
}
|
||||
|
|
@ -86,8 +90,31 @@ public class SettingsOsmEditingActivity extends SettingsBaseActivity {
|
|||
if (positiveResult) {
|
||||
settings.USER_NAME.set(userNameEditText.getText().toString());
|
||||
settings.USER_PASSWORD.set(passwordEditText.getText().toString());
|
||||
new ValidateOsmLoginDetailsTask(SettingsOsmEditingActivity.this).execute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static class ValidateOsmLoginDetailsTask extends AsyncTask<Void, Void, OsmBugsUtil.OsmBugResult> {
|
||||
private final Context context;
|
||||
|
||||
public ValidateOsmLoginDetailsTask(Context context) {
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected OsmBugsUtil.OsmBugResult doInBackground(Void... params) {
|
||||
OsmEditingPlugin plugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
|
||||
assert plugin != null;
|
||||
OsmBugsRemoteUtil remoteUtil = plugin.getOsmNotesRemoteUtil();
|
||||
return remoteUtil.validateLoginDetails();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(OsmBugsUtil.OsmBugResult osmBugResult) {
|
||||
if (osmBugResult.warning != null) {
|
||||
Toast.makeText(context, osmBugResult.warning, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue