From d347cce3b332122ed69d14065636c1624b7b74b8 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 01:22:14 +0100 Subject: [PATCH 001/372] Try fix issue where distances in serach history tab are not updated when origin is changed --- .../osmand/plus/activities/search/SearchHistoryFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index d08a875ca3..8b9d14450a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -89,7 +89,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear if (location == null) { location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation(); } - + locationUpdate(location); clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE); } From a08bb8d0f819da5077436104edd5a6641f5e3ac0 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 29 Dec 2014 18:24:45 +0100 Subject: [PATCH 002/372] Translated using Weblate (Italian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-it/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index aa00332615..93306d0bd2 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1619,7 +1619,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz \n Nota: i file precedenti non verranno modificati. \n Nota: non sarà possibile condividere i files fra OsmAnd and OsmAnd+. Vuoi che OsmAnd sposti anche i propri dati nella nuova destinazione? Scegli \'No\' perché OsmAnd crei e utilizzi una nuova cartella. - Copia in corso del file (%s) nella nuova destinazione... + Copia in corso del file (%s) nella nuova destinazione… Copia in corso dei file OsmAnd nella nuova destinazione (%s) Copia dei file di dati di OsmAnd Calcola percorso OsmAnd offline @@ -1743,7 +1743,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Clicca per visualizzare o condividere l\'id della tracciabilità. Usando l\'id della tracciabilità i dispositivi connessi saranno in grado di seguire tutti i movimenti di questo dispositivo! Per disconnettersi seleziona Opzione rigenera. Token della sessione: %1$s - In attesa di autorizzazione... + In attesa di autorizzazione… Localizzazioni inviate %1$d (nel buffer %2$d) Connessione stabilita: %1$s Riavvia la sessione OsMo @@ -1911,7 +1911,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Cinese semplificato Cinese tradizionale Percorsi metró - Invita ... + Invita… Vuoi abbandonare il gruppo %1$s? Per favore specifica l\'id Prosegui la navigazione @@ -1934,7 +1934,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Automobile Bicicletta Pedone - Altro... + Altro… Scaricare le mappe mancanti %1$s (%2$d MB)? Tutti Punti intermedi From 961dfafeac6b6c87c19dc3ce5602aed87b082dda Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Mon, 29 Dec 2014 23:51:21 +0100 Subject: [PATCH 003/372] Translated using Weblate (Sardinian) Currently translated at 99.9% (1594 of 1595 strings) --- OsmAnd/res/values-sc/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index ebc892d375..958223bcde 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -60,8 +60,8 @@ Annànghe unu puntu de destinatzione Issèbera GPX… Issèbera sa destinatzione - Issèbera in sa mapa… - Preferridu… + Ischerta in sa mapa… + Prefèrridu… Preferèntzias pro s\'àndala Informatziones de s\'àndalas Preferre sas autostradas @@ -82,7 +82,7 @@ \n Nota 1: sos datos antepostos tuos non at a èssere mudados (ma podent essere burrados manualmente). \n Nota 2: in sa cartella noa non at a èssere possìbile cumpartzire sos datos intra OsmAnd e OsmAnd+. Boles chi OsmAnd còpiet sos datos suos fintzas in sa destinatzione noa? Icherta \"Nono\" pro fàghere petzi creare ed impreare una cartella noa a OsmAnd. - Copiande su documentu (%s) in sa destinatzione noa... + Copiande su documentu (%s) in sa destinatzione noa… Copiande sos datos de OsmAnd in (%s), sa destinatzione noa Copiande sos datos de OsmAnd Càlcula s\'àndala OsmAnd sena lìnia @@ -574,7 +574,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Sarba comente grupu de prefèrridos Issèbera sas tapas Etichetas de sos puntos - Carrigamentu de %1$s … + Carrigamentu de %1$s… Oràriu atuale Tapa \n\nTene carcau pro lu bìere in sa mapa @@ -675,7 +675,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Id pessonale arrastamentu Carca pro visualizzare o cumpartzire s\'id de arrastamentu. Impreande s\'id de arrastamentu sos dispositivos connessos ant a èssere capatzes de sighire totu sos movimentos de custu dispositivu! Pro ti disconnèttere ischerta s\'optzione Reingendra. Token de sa sessione: %1$s - Isetande pro s\'autorizatzione... + Isetande pro s\'autorizatzione… "Localizatziones imbiadas %1$d (in su buffer %2$d) " "Connessione istabilida: %1$s " "Mudas in sa 1.8: * Càlcula s\'àndala intre duos puntos de una rasta GPX * Mudada s\'aspetu pro s\'isgarrigamentu de sos istados (suportu pro sa chirca cun nùmenes locales) * Suportu pro s\'importatzione GPX/KML (cunvertere dae KML a GPX) * Sas rastas GPX sunt istadas mòvidas in \'Datos meos\' * Como podes partzire sas rastas GPX pro distantzia e compidare sa diferèntzia de artària/ lestresa * Aviu automàticu de su nàvigu a pustis de un isetu curtzu " @@ -948,7 +948,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Sarba Sarba diretziones Edifìtzios colorados pro casta - Invita... + Invita… Boles essire dae su grupu %1$s? Pro piaghere dislinda s\'id Sighi cun su nàvigu @@ -1382,7 +1382,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres S\'àudio est deativadu Àudio deativadu Iscarrigare sas mapas fartantes %1$s (%2$d MB)? - Àteru... + Àteru… Imbiu de sos documentos GPX a sa comunidade OSM. Los ant a impreare pro megiorare sas mapas. Ogetu/os %1$d de %2$d carrigadu curretamente. "Podes cumpartzire sa positzione de sos logos interesantes de sos biagios tuos cun familiares e amigos, tràmite su Menù cuntestuale \'Imprea sa positzione\' → \'Cumpartzi positzione\'. From 197c34a0d7d513b1f63d67a7cb0bfb44521efeae Mon Sep 17 00:00:00 2001 From: ace shadow Date: Mon, 29 Dec 2014 18:02:35 +0100 Subject: [PATCH 004/372] Translated using Weblate (Slovak) Currently translated at 99.9% (1594 of 1595 strings) --- OsmAnd/res/values-sk/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 9451dd490a..93a950b60b 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1595,7 +1595,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Kamión Kopírujem dátové súbory OsmAnd do nového cieľa (%s) Kopírujem dátové súbory OsmAnd - Kopírujem súbor (%s) do nového cieľa... + Kopírujem súbor (%s) do nového cieľa… Chcete aby OsmAnd presunul údajové súbory do nového cieľa? Zvoľte \"Nie\" ak chcete, aby OsmAnd len vytvoril a použil nový prázdny priečinok. Vypočítať OsmAnd offline trasu Od Androidu verzie 4.4 (KitKat) nie je možné sťahovať a aktualizovať mapy v pôvodnom úložnom priečinku (%s). Chcete ho zmeniť na vhodné nové úložisko a skopírovať tam všetky súbory? @@ -1614,10 +1614,10 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Vyhnúť sa diaľniciam Hmotnostný limit Zadajte hmotnosť vozidla, ktorá musí byť povolená na cestách - Vybrať GPX … + Vybrať GPX… Vybrať cieľ - Vybrať na mape … - Obľúbené … + Vybrať na mape… + Obľúbené… Predvoľby trasy Informácie trasy Pridať ako cieľový bod @@ -1736,7 +1736,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Kliknite pre zobrazenia alebo zdieľanie ID sledovacieho zariadenia. Pomocou ID budú pripojené zariadenia schopné sledovať všetky pohyby tohto zariadenia! Pre odpojenie použite možnosť "Pregenerovať". Token relácie: %1$s - Čaká sa na autorizáciu... + Čaká sa na autorizáciu… Odoslané polohy %1$d (v zásobníku %2$d) Vytvorené spojenie: %1$s Reštartovať reláciu OsMo @@ -1804,7 +1804,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Vyprší za Popis Pravidlá - Načítava sa %1$s … + Načítava sa %1$s… Aktuálny čas Prechodný bod \n\nStlačte a podržte pre zobrazenie na mape @@ -1902,7 +1902,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Kresliť chodníky podľa značenia OSMC Vyfarbiť budovy podľa typu - Pozvať... + Pozvať… Chcete opustiť skupinu %1$s? Prosím zadajte ID Skoro @@ -1918,7 +1918,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Bicykel Chodec Stiahnuť chýbajúce mapy %1$s (%2$d MB)? - Viac... + Viac… Všetky Prechodné body Ciele From 8c091ef7ec2fcdcf96258a00972a9253e6f2c4f7 Mon Sep 17 00:00:00 2001 From: Damjan Gerl Date: Tue, 30 Dec 2014 00:56:13 +0100 Subject: [PATCH 005/372] Translated using Weblate (Slovenian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-sl/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 103a574333..86f15a8079 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1609,15 +1609,15 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Svetovni popravki nadmorske višine Svetovne pomorske oznake Dodaj kot ciljno točko - Izberite GPX… + Izberite GPX … Izberite cilj - Izberite na zemljevidu… - Priljubljene… + Izberite na zemljevidu … + Priljubljene … Od Android verzije 4.4 (KitKat) naprej, prenos posodobitev zemljevidov ni mogoč na prejšnjo mesto hrambe (%s). Ali želite to spremeniti na takšno mesto, kjer bo to mogoče in skopirati vse OsmAnd podatke tja? \n Opomba 1: stare datoteke ne bodo spremenjene (vendar jih lahko ročno izbrišete). \n Opomba 2: v novem mestu shrambe si aplikaciji OsmAnd and OsmAnd+ ne bosta mogli deliti podatkov. OsmAnd lahko poskusi premakniti podatke na novo mesto hrambe. Ali si želite tega? Izberite \'Ne\' če želite, da OsmAnd ustvari in uporablja novo mapo. - Kopiranje datoteke (%s) na novo mesto hrambe... + Kopiranje datoteke (%s) na novo mesto hrambe … Kopiranje datotek s podatki za OsmAnd na novo mesto hrambe (%s) Kopiranje datotek s podatki programa OsmAnd Prikaz položaja vedno v središču @@ -1703,7 +1703,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Pošiljanje mojih lokacij OsMo hiter dostop Povezane naprave - Čakanje na dovoljenje... + Čakanje na dovoljenje … Ali ste prepričani, da želite ustvariti nov ID uporabnika? Vse naprave, ki so povezane z vami, vam ne bodo mogle več slediti. Izberite časovni interval za pošiljanje lokacije Poveži @@ -1836,7 +1836,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Proge podzemne železnice Nadaljuj navigacijo Skala alpskega pohodništva (SAC) - Povabite... + Povabite … Prosim, določite ID Zgodaj Običajno @@ -1849,7 +1849,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Izberite velikost posnetkov vgrajenega fotoaparata Najavi bližino priljubljenih krajev Prenos manjkajočih zemljevidov %1$s (%2$d MB)? - Več... + Več … Avtomobil Kolo Pešec From 824726be7b4470a94573f2673816b27e057462d8 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Mon, 29 Dec 2014 20:55:36 +0100 Subject: [PATCH 006/372] Translated using Weblate (Danish) Currently translated at 100.0% (607 of 607 strings) --- OsmAnd/res/values-da/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 14e1be0f8b..09c8597904 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -65,7 +65,7 @@ Nyhedsbureau Optiker Økologiske fødevarer - Fritidsbeklædning + Friluftsudstyr Malerværksted Dyrehandel Radiodele From 3f9f6c08f274571b1e0606dedd913c5d411fd929 Mon Sep 17 00:00:00 2001 From: elPresidento Date: Tue, 30 Dec 2014 07:07:41 +0100 Subject: [PATCH 007/372] Translated using Weblate (Czech) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-cs/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index c5c87eb4f1..bd436ebf94 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1809,4 +1809,5 @@ s často kladenými otázkami. Americký atlas cest Nepoužívat v1.9 routování Nepoužívat výpočet trasy verze 1.9 + Oznamovat přechody pro chodce From 9fdff2d9a7979c1ae137ba81cf05b5e6df91fe67 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 09:34:08 +0100 Subject: [PATCH 008/372] try fix FC "SearchTransportFragment{42a8c8d8} not attached to Activity" when quickly changing screen orientation on searchTransport screen --- .../osmand/plus/activities/search/SearchTransportFragment.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java index 3d95ce7375..8989d1b344 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java @@ -220,11 +220,14 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA } @Override protected void onPostExecute(List result) { + // isAdded here tries to fix FC when rapidly changing screen orientation + if (isAdded()) { stopsAdapter.setNewModel(result); updateSearchMoreButton(); searchArea.setText(getSearchArea()); progress.setVisibility(View.INVISIBLE); asyncTask = null; + } } }; asyncTask = current; From 9f43f71a984ac676abf3c223576dcaf252c0a902 Mon Sep 17 00:00:00 2001 From: elPresidento Date: Tue, 30 Dec 2014 07:31:17 +0100 Subject: [PATCH 009/372] Translated using Weblate (Czech) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-cs/strings.xml | 60 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index bd436ebf94..57982ef573 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -221,10 +221,10 @@ Adresy… Oblíbených… Nedefinováno - Souřadnic + Opraveno Momentální polohy… Posledního místa na mapě - Hledat v okolí : + Počáteční bod: Hledat "Poslední změny ve verzi 0.6.7 : \n\t- Správce offline dat (stáhnout, smazat, zálohovat přímo z OsmAndu) @@ -336,7 +336,7 @@ Speciální aktivita pro vývojovou verzi Aktualizace offline map "Mít k dispozici aktuální mapová data je důležité. OsmAnd obsahuje správce stahování map, kde můžete snadno ověřit, zda jsou k dispozici novější mapy. -\n\t Pro zkontrolování aktualizací \'Hlavní Menu\'->\'Nastavení\'->\'Spravovat mapové soubory\'->\'Stáhnout\'. Po aktualizaci seznamu z internetu vyberte z kontextového menu \'Zobrazit jen aktualizace\'. +\n\t Pro zkontrolování aktualizací \'Hlavní Menu\'->\'Nastavení\'->\'Spravovat mapové soubory\'->\'Stáhnout\'. Po aktualizaci seznamu z Internetu vyberte z kontextového menu \'Zobrazit jen aktualizace\'. \n\t Teď se zobrazí jen indexy, které už máte stažené. Navíc jsou zvýrazněné následovně: \n\t Zelená - označuje aktuální mapy a data \n\t Modrá - označuje mapy a data, u kterých lze stáhnout novější verzi\n\t Tmavě zelená/Modrá - označuje vypnuté datové spojení " @@ -391,7 +391,7 @@ Vyberte překryvnou mapu Mapa je již nainstalovaná, aktualizuji nastavení Vyberte mapy k instalaci nebo aktualizaci - Internetové připojení není dostupné + Pro tuto akci je potřebné internetové připojení, ale není dostupné Instalovat další… Zobrazovat vektorové mapy od minimálního zvětšení Zvětšení vektorové mapy @@ -1360,11 +1360,11 @@ s často kladenými otázkami. Profily aplikace Mořská značka Přidat jako cíl - Vybrat GPX … + Vybrat GPX… Chcete použít zobrazenou trasu pro navigaci? Vybrat cíl - Vybrat na mapě … - Oblíbené … + Vybrat na mapě… + Oblíbené… Předvolby trasy Informace o trase Upřednostňovat dálnice @@ -1384,7 +1384,7 @@ s často kladenými otázkami. Od verze Androidu 4.4 (KitKat) není možné stahovat a aktualizovat mapy v předchozím úložišti (%s). Chcete ho změnit na vhodné nové úložiště a zkopírovat do něj všechny soubory?\n Poznámka 1: Původní soubory zůstanou nedotčeny a mohou být smazány ručně. \n Poznámka 2: V novém úložišti nebude možné sdílet soubory mezi OsmAnd a OsmAnd+. Chcete aby OsmAnd také zkopíroval své datové soubory do nového cíle? Vybráním \'Ne\' OsmAnd pouze vytvoří a použije nový adresář. - Kopírování souboru (%s) do nového umístění... + Kopírování souboru (%s) do nového umístění… Kopírování datových souborů OsmAnd do nového umístění (%s) Kopírování datových souborů OsmAnd Vypočítat OsmAnd offline trasu @@ -1410,7 +1410,7 @@ s často kladenými otázkami. Obnovit kanály Sledovat objekt Nesledovat objekt - Vypočítat OsmAnd trasu bez připojení na internet + Vypočítat OsmAnd trasu bez připojení na Internet Vypočítat OsmAnd trasu pro první a poslední úsek "OsmAnd umožňuje zobrazení vektorových map v různých stylech podle vašich potřeb: \n\nMimo vyváženého stylu default můžete v Menu → Nastavení mapy → Vektorový vykreslovač vybrat například: @@ -1539,7 +1539,7 @@ s často kladenými otázkami. Klikněte pro zobrazení nebo sdílení ID sledovaného zařízení. Pomocí ID budou připojená zařízení schopná sledovat všechny pohyby tohoto zařízení! Pro odpojení použijte možnost "Regenerovat uživatelské ID". Token relace: %1$s - Čekání na autorizaci... + Čekání na autorizaci… Odeslané polohy %1$d (v zásobníku %2$d) Vytvořená spojení: %1$s Problém s připojením OsMo: @@ -1583,7 +1583,7 @@ s často kladenými otázkami. Zrušit pohyblivý cíl Zarovnat na střed obrazovky Nastavit jako pohyblivý cíl - Načítá se %1$s … + Načítá se %1$s… Aktuální čas Spustit navigaci automaticky vybrané @@ -1627,7 +1627,7 @@ s často kladenými otázkami. Automatické připojení OsMo služba OsMo trasa %1$s stažena. - Není nic ke stažení, prosím zkontrolujte připojení k Internetu. + Není nic ke stažení, prosím zkontrolujte vaše připojení k Internetu. Nebyl vybrán žádný GPX soubor. Podržením vyberte z dostupných tras. Skrýt budovy Skrýt text @@ -1668,7 +1668,7 @@ s často kladenými otázkami. Trasy metra Pozastavit navigaci Pokračování v navigaci - Pozvat... + Pozvat… Chcete opustit skupinu %1$s? Prosím určete id Barvy budov podle typu @@ -1694,7 +1694,7 @@ s často kladenými otázkami. Vyberte velikost obrázku interního fotoaparátu Odstranit všechny Oznamovat oblíbená místa v blízkosti -Více... +Více… Standardní Automobil Jízdní kolo @@ -1765,9 +1765,9 @@ s často kladenými otázkami. Vyhnout se cestám… Skrýt Zapnout obrazovku - Zapnout obrazovku když se blíží odbočka - " OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí (nedostupné ve verzi zdarma) - Neomezené stahování, přímo z aplikace (ve verzi zdarma je limit 10 mapových souborů) - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara " - " OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). OsmAnd+ je placená verze aplikace. Její zakoupením podpoříte projekt, nové funkce a získáte nejnovější aktualizace map. Aplikaci si můžete před zakoupením vyzkoušet nainstalováním verze zdarma nazvané OsmAnd. Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí - Neomezené stahování, přímo z aplikace - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara " + Zapnout obrazovku zařízení když se blíží odbočka + " OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k Internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí (nedostupné ve verzi zdarma) - Neomezené stahování, přímo z aplikace (ve verzi zdarma je limit 10 mapových souborů) - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara " + " OsmAnd (OSM Automated Navigation Directions - Automatizované navigační pokyny) je mapová a navigační aplikace s přístupem ke kvalitním celosvětovým údajům z OpenStreetMap (OSM). Všechny údaje map mohou být uloženy na paměťové kartě ve vašem zařízení pro použití bez přístupu k Internetu (offline). Pomocí GPS ve vašem zařízení může OsmAnd nabídnout navigování vizuálními a hlasovými pokyny pro automobil, kolo a chodce. Všechny hlavní funkce pracují online i offline (bez nutnosti přístupu k Internetu). OsmAnd+ je placená verze aplikace. Její zakoupením podpoříte projekt, nové funkce a získáte nejnovější aktualizace map. Aplikaci si můžete před zakoupením vyzkoušet nainstalováním verze zdarma nazvané OsmAnd. Některé hlavní funkce: Navigace: - Funguje online (rychlá) nebo offline (bez poplatků za roaming v zahraničí) - Hlasové navádění po jednotlivých zatáčkách (nahrané i syntetizované hlasy) - Volitelné navádění v jízdních pruzích, zobrazení názvů ulic a odhadovaný čas do cíle - umožňuje zadat přechodné body trasy - Automatické přepočítání trasy pokud se odchýlíte z trasy - Hledání míst podle adresy, typu (např .: restaurace, hotely, čerpací stanice, muzea) nebo zeměpisných souřadnic Zobrazení mapy: - Zobrazování vaší pozice a orientace na mapě - Možnost zobrazení mapy ve směru pohybu nebo podle kompasu - Uložení oblíbených míst - zobrazení POI (bodů zájmu) v okolí - Možnost zobrazit specializované podkladové mapy z Internetu - Možnost zobrazit satelitní snímky (z Bing) - Možnost zobrazit různé překryvné vrstvy jako turistické / navigační GPX stopy a další mapy s nastavitelnou průhledností - Volitelně může zobrazit názvy v angličtině, lokálním jazyku nebo foneticky Využívá data z OpenStreetMap a Wikipedie: - Informace vysoké kvality z nejlepších projektů světa - Globální mapy z OpenStreetMap dostupné podle země nebo regionu - Body zájmu z Wikipedie, vhodné pro návštěvu zajímavostí - Neomezené stahování, přímo z aplikace - Vždy aktuální mapy (aktualizováno nejméně jednou za měsíc) - Kompaktní vektorové offline mapy - Možnost volby mezi kompletními mapami nebo silniční sítí (např. celé Japonsko má 700 MB, silniční síť pouze 200 MB) - Podporuje i podkladové dlaždice z Internetu Bezpečnostní funkce: - Volitelné automatické přepínání mezi denním a nočním režimem - Volitelné zobrazení povolené rychlosti s upozorněním na její překročení - Volitelné přibližování mapy podle rychlosti - Sdílejte vaši polohu s přáteli, aby vás mohli najít Funkce pro cyklisty a chodce: - Mapy obsahují i cesty pro pěší, turisty a cyklisty - vhodné pro aktivity v přírodě - Speciální režimy zobrazení a navigace pro chodce a cyklisty - Volitelné zobrazení zastávek hromadné dopravy (autobus, tramvaj, vlak) včetně názvů linek - Volitelné nahrávání výletu do GPX souboru (lokálního nebo online služby) - Volitelné zobrazení rychlosti a nadmořské výšky - zobrazení vrstevnic a stínování svahů (s doplňkovými moduly) Přímo přispívejte do OpenStreetMap: - Nahlášení chyb v mapě - Odeslání GPX stop do OSM přímo z aplikace - Přidání POI a přímé odeslání do OSM (nebo později, pokud jste offline) - Volitelné nahrávání výletu na pozadí (když je zařízení v režimu spánku) OsmAnd je svobodný a aktivně vyvíjený software. Každý může přispět do aplikace hlášením chyb, vylepšením překladu nebo programováním nových funkcí. Projekt je ve stavu soustavného vylepšování díky spolupráci vývojářů a uživatelů. Pokrok projektu také závisí na finančních příspěvků na vývoj, programování a testování nových funkcí. Koupením OsmAnd + (placená verze) pomůžete aplikaci být ještě lepší! Na osmand.net můžete přispět obecně nebo na vývoj konkrétní funkce. Přibližná kvalita pokrytí: - Západní Evropa: **** - Východní Evropa: *** - Rusko: *** - Severní Amerika: *** - Jižní Amerika: ** - Asie: ** - Japonsko a Korea: *** - Blízký Východ: ** - Afrika: ** - Antarktida: * Seznam obsažených zemí (prakticky celý svět!): Afghánistán, Albánie, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Argentina, Arménie, Aruba, Austrálie, Ázerbájdžán, Bahamy, Bahrajn, Bangladéš, Barbados, Belgie, Belize, Benin, Bermudy, Bhútán, Bělorusko, Bolívie, Bonaire, Bosna a Hercegovina, Botswana, Brazílie, Britské Panenské Ostrovy, Brunei, Bulharsko, Burkina Faso, Burundi, Curaçao, Kypr , Čad, Česká Republika, Černá hora, Chile, Čína, Dánsko, Dominika, Dominikánská Republika, Džibuti, Egypt, Ekvádor, El Salvador, Eritrea, Estonsko, Etiopie, Fiji, Filipíny, Finsko, Francouzská Guyana, Francouzská Polynésie, Francie, Gabon , Gambie, Ghana, Gibraltar, Řecko, Grenada, Grónsko, Gruzie, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Nizozemské Antily, Nizozemsko, Honduras, Hong Kong, Chorvatsko, Indie, Indonésie, Irák , Írán, Irsko, Island, Izrael, Jamajka, Japonsko, Jemen, Jersey, Jordánsko, Jižní Afrika, Jižní Súdán, Kambodža, Kamerun, Kanada, Kapverdy, Katar, Kazachstán, Keňa, Kiribati, Kolumbie, Komory, Kongo, Kostarika, Kuba , Kuvajt, Kyrgyzskou, Laos, Lesotho, Libanon, Libérie, Libye, Lichtenštejnsko, Litva, Lotyšsko, Lucembursko, Macao, Makedonie, Madagaskar, Maďarsko, Malajsie, Malawi, Maledivy, Mali, Malta, Maroko, Martinik, Mauretánie, Mauricius, Mayotte , Mexiko, Mikronésie, Myanmar, Moldavsko, Monako, Mongolsko, Montserrat, Mosambik, Namibie, Nauru, Německo, Nepál, Niger, Nigérie, Nikaragua, Norsko, Nová Kaledonie, Nový Zéland, Omán, Ostrov Man, Pákistán, Palau, Palestinská území , Panama, Papua Nová Guinea, Paraguay, Peru, Pobřeží slonoviny, Polsko, Portoriko, Portugalsko, Rakousko, Rovníková Guinea, Rumunsko, Rusko, Rwanda, Sadská Arábie, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin , Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Senegal, Severní a Jižní Korea, Seychely, Sierra Leone, Singapur, Slovensko, Slovinsko, Somálsko, South Georgia, Spojené Arabské Emiráty, Spojené království (UK), Spojené Státy Americké (USA), Srbsko, Srí Lanka, Středoafrická republika, Súdán, Surinam, Svazijsko, Sýrie, Španělsko, Švýcarsko, Švédsko, Tádžikistán, Taiwan, Itálie, Tanzanie, Thajsko, Togo, Tokelau, Tonga, Trinidad a Tobago, Tunisko , Turecko, Turkmenistán, Tuvalu, Uganda, Ukrajina, Uruguay, Uzbekistán, Vanuatu, Vatikán, Venezuela, Vietnam, Východní Timor, Wallis a Futuna, Zambie, Západní Sahara " %1$s potřebuje tato oprávnění pro vypnutí obrazovky při režimu šetření energie. Nikdy Pokročilé @@ -1775,16 +1775,16 @@ s často kladenými otázkami. ZOBRAZIT MAPU Použít zabezpečené spojení se serverem Použít HTTPS - Máte %1$s aktualizací map + K dispozici aktualizace pro %1$s map Hledat ZOBRAZIT VŠE Souřadnice Zavřít - Vše je aktuální + Všechny soubory jsou aktuální Použít OpenGL Použít hardwarově akcelerované renderování pomocí OpenGL (nemusí fungovat na všech zařízeních) - Nebyla nalezena nejbližší silnice - Není možné stáhnout. Prosím připojte se na Wi-Fi, aby bylo možné pokračovat. + Žádná objížďka nenalezena + Stahování není možné. Prosím zkontrolujte internetové připojení. Jazyk map Zastávky veřejné dopravy Zóna @@ -1796,18 +1796,18 @@ s často kladenými otázkami. Máte staženo %1$s map Stáhnout novou mapu Spravovat - Chcete stáhnout nějakou offline mapu? + Chcete stáhnout offline mapy? Hlasové pokyny Styl cesty Výchozí Oranžová - Německý atlas cest - Železnice - Chodec - Zobrazovat varování železnice - Zobrazovat varování chodců - Americký atlas cest - Nepoužívat v1.9 routování - Nepoužívat výpočet trasy verze 1.9 + Německý Atlas cest + Železniční přejezd + Přechod pro chodce + Zobrazovat železniční přejezdy + Zobrazovat přechody pro chodce + Americký Atlas cest + Nepoužívat routovací pravidla v1.9 + Nepoužívat pravidla výpočtu trasy zavedené ve verzi 1.9 Oznamovat přechody pro chodce From a87f8d91758538f7b80b840c1997b8eda6bca425 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Tue, 30 Dec 2014 07:23:32 +0100 Subject: [PATCH 010/372] Translated using Weblate (Danish) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-da/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 0acc5535eb..1c2e64c93a 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1452,7 +1452,7 @@ Lastbil Beregn OsmAnd offline rute "Skal OsmAnd også kopiere datafiler til den nye placering? Vælg \'Nej\' hvis OsmAnd kun skal oprette og bruge den nye mappe." - Kopierer fil (%s) til den ny placering... + Kopierer fil (%s) til den ny placering… Kopierer OsmAnd datafiler til ny destination (%s) Kopierer OsmAnd datafiler "Siden Android version 4.4 (KitKat) kan man ikke hente og opdatere kort i den tidligere lagerplacering (%s). Ønsker du at skifte til den tilladte placering og kopiere alle OsmAnd datafiler dertil?          @@ -1586,7 +1586,7 @@ Personligt sporings-id Klik for at se eller dele sporings-id. Med sporings-id vil tilsluttede enheder være i stand til at overvåge alle bevægelser af enheden! For at afbryde, vælg \'Forny personlig id\' mulighed. Sessiontoken: %1$s - Venter på autorisation... + Venter på autorisation… Placeringer sendt %1$d (i buffer %2$d) Forbindelse oprettet: %1$s Genstart OsMo session From 0ec07048a20a4f8c0115a680cf139a3e19ee7901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Tue, 30 Dec 2014 03:47:01 +0100 Subject: [PATCH 011/372] Translated using Weblate (Korean) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ko/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 226f9f4a41..a7324bd720 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -237,7 +237,7 @@ 현재 위치… 마지막 지도 보기 - 기원 : + 원점 : 가까운 주변 검색 "0.6.7 버전에 대한 변경사항들 : \n\t- 오프라인 데이터 관리 (OsmAnd 에서 직접 오프라인 데이터 다운로드, 삭제, 활성화 / 비활성화) From f1e1882608d741fa1d1a16525c8eaeefdc011515 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Tue, 30 Dec 2014 06:05:54 +0100 Subject: [PATCH 012/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1595 strings) --- OsmAnd/res/values-sv/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index cdc7f11259..0e7f054bf0 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -426,7 +426,7 @@ Visa på karta Söker plats … Plats (hittad) -Adress … +Adresser … Favoriter … Odefinierad @@ -586,7 +586,7 @@ Näring Turism Transport -Indexerar adress … +Indexerar adresser … Indexerar kartan … Indexerar POI … Indexerar transport … From 40fa9e00fe688e62554aa9aa1141a6edcf348108 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 10:07:19 +0100 Subject: [PATCH 013/372] backout unneeded fix for distance update issue in SearchHistoryFragment --- .../net/osmand/plus/activities/search/SearchHistoryFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 8b9d14450a..d48c4460b4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -89,7 +89,6 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear if (location == null) { location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation(); } - locationUpdate(location); clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE); } From 91ba848d073e434e68270936b90235b9d2d24d37 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 10:10:31 +0100 Subject: [PATCH 014/372] document fix for "is no Attached" FC --- .../activities/search/SearchTransportFragment.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java index 8989d1b344..c24f99f194 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java @@ -220,13 +220,13 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA } @Override protected void onPostExecute(List result) { - // isAdded here tries to fix FC when rapidly changing screen orientation + // isAdded() here fixes the "not attached to Activity" FC when rapidly changing screen orientation if (isAdded()) { - stopsAdapter.setNewModel(result); - updateSearchMoreButton(); - searchArea.setText(getSearchArea()); - progress.setVisibility(View.INVISIBLE); - asyncTask = null; + stopsAdapter.setNewModel(result); + updateSearchMoreButton(); + searchArea.setText(getSearchArea()); + progress.setVisibility(View.INVISIBLE); + asyncTask = null; } } }; From 359b04257416987ab9650ba09018361dc1df0357 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 10:51:54 +0100 Subject: [PATCH 015/372] slighly refactor SearchHistoryFragment to debug missing distance update when origin is chenged --- .../plus/activities/search/SearchHistoryFragment.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index d48c4460b4..9573743f56 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -97,7 +97,9 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear public void locationUpdate(LatLon l) { location = l; if(historyAdapter != null) { - historyAdapter.notifyDataSetChanged(); + //historyAdapter.notifyDataSetChanged(); + //This did not update distances when origin was changed, try this: + historyAdapter.updateLocation(l); } } @@ -126,6 +128,11 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear class HistoryAdapter extends ArrayAdapter { + public void updateLocation(LatLon l) { + location = l; + notifyDataSetChanged(); + } + public HistoryAdapter(List list) { super(getActivity(), R.layout.search_history_list_item, list); } From 8c93c4ab9324ccd52e45cefcbd1610e893f621e9 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 11:02:37 +0100 Subject: [PATCH 016/372] declare location separately in class as is done in FavoritesListFragment --- .../net/osmand/plus/activities/search/SearchHistoryFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 9573743f56..d518819151 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -127,6 +127,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear } class HistoryAdapter extends ArrayAdapter { + private LatLon location; public void updateLocation(LatLon l) { location = l; From 08fc6f698ad21913fccd04035b7fec036110b215 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Tue, 30 Dec 2014 11:02:41 +0100 Subject: [PATCH 017/372] Translated using Weblate (Catalan) Currently translated at 17.9% (109 of 607 strings) --- OsmAnd/res/values-ca/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index e49c3828c4..ad870574b9 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -66,7 +66,7 @@ Port de muntanya Muralla Inspecció de vehicles - Centre d\'explosió nuclear + Lloc d\'explosió nuclear Camp d\'instrucció Base naval militar Zona militar From ed17ced7ba39834b4551dd44b916746e69c9a631 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 11:20:25 +0100 Subject: [PATCH 018/372] complete change for missing distance update upon origin change in SearchHistoryFragment --- .../osmand/plus/activities/search/SearchHistoryFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index d518819151..f0ddf81f44 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -89,6 +89,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear if (location == null) { location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation(); } + locationUpdate(location); clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE); } @@ -97,8 +98,6 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear public void locationUpdate(LatLon l) { location = l; if(historyAdapter != null) { - //historyAdapter.notifyDataSetChanged(); - //This did not update distances when origin was changed, try this: historyAdapter.updateLocation(l); } } From fdb06c46f089c5c3d92e92830237f5be77308944 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Tue, 30 Dec 2014 11:12:00 +0100 Subject: [PATCH 019/372] Translated using Weblate (Catalan) Currently translated at 18.6% (113 of 607 strings) --- OsmAnd/res/values-ca/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index ad870574b9..5f11850359 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -113,4 +113,8 @@ Mina històrica Porta Venda de tabac + Botiga de catifes + Magatzem de roba + Roba infantil + Pelleteria From 9bcb3c56114fb1acced524f2f0294f8d8316d78b Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 11:41:36 +0100 Subject: [PATCH 020/372] fix also searchAddressOnline fragment to be origin aware --- .../activities/search/SearchAddressOnlineFragment.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java index 4cac70a352..e2d0abe87d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java @@ -132,13 +132,14 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea if (location == null) { location = settings.getLastKnownMapLocation(); } + locationUpdate(location); } @Override public void locationUpdate(LatLon l) { location = l; if(adapter != null){ - adapter.notifyDataSetInvalidated(); + adapter.updateLocation(l); } } @@ -244,6 +245,12 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea } class PlacesAdapter extends ArrayAdapter { + private LatLon location; + + public void updateLocation(LatLon l) { + location = l; + notifyDataSetChanged(); + } public PlacesAdapter(List places) { super(getActivity(), R.layout.search_address_online_list_item, places); From 283238c6a1547b671d2da1b6706df5105216918d Mon Sep 17 00:00:00 2001 From: josep constanti Date: Tue, 30 Dec 2014 11:22:52 +0100 Subject: [PATCH 021/372] Translated using Weblate (Catalan) Currently translated at 18.7% (114 of 607 strings) --- OsmAnd/res/values-ca/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 5f11850359..b9cd1de3fc 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -117,4 +117,5 @@ Magatzem de roba Roba infantil Pelleteria + Botiga de teixits From 90f87ddc35bf57d29a18324433f06e7d5c043ebf Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 12:17:49 +0100 Subject: [PATCH 022/372] use getLocation as in FavoritesListFragment --- .../plus/activities/search/SearchHistoryFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index f0ddf81f44..4974b04dd7 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -128,6 +128,10 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear class HistoryAdapter extends ArrayAdapter { private LatLon location; + public LatLon getLocation() { + return location; + } + public void updateLocation(LatLon l) { location = l; notifyDataSetChanged(); @@ -138,7 +142,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear } @Override - public View getView(final int position, View convertView, ViewGroup parent) { + public View getView(int position, View convertView, ViewGroup parent) { View row = convertView; if (row == null) { LayoutInflater inflater = getActivity().getLayoutInflater(); From be17e2780f904115e3e4a0d128ee8d3d274e571c Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 12:31:12 +0100 Subject: [PATCH 023/372] test without onResume code --- .../activities/search/SearchAddressOnlineFragment.java | 3 ++- .../plus/activities/search/SearchHistoryFragment.java | 9 +++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java index e2d0abe87d..3b0954fe36 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java @@ -132,7 +132,8 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea if (location == null) { location = settings.getLastKnownMapLocation(); } - locationUpdate(location); + //TODO: Next line somehow breaks that distances are updated in list after origin is changed, but omitting it leads to no distences are shown upon first list view + //locationUpdate(location); } @Override diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 4974b04dd7..2be38f4ecc 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -89,7 +89,8 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear if (location == null) { location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation(); } - locationUpdate(location); + //TODO: Next line somehow breaks that distances are updated in list after origin is changed, but omitting it leads to no distences are shown upon first list view + //locationUpdate(location); clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE); } @@ -128,10 +129,6 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear class HistoryAdapter extends ArrayAdapter { private LatLon location; - public LatLon getLocation() { - return location; - } - public void updateLocation(LatLon l) { location = l; notifyDataSetChanged(); @@ -142,7 +139,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear } @Override - public View getView(int position, View convertView, ViewGroup parent) { + public View getView(final int position, View convertView, ViewGroup parent) { View row = convertView; if (row == null) { LayoutInflater inflater = getActivity().getLayoutInflater(); From f29262812803dc2492a51187525118f5313f827d Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 13:11:17 +0100 Subject: [PATCH 024/372] set correct location --- .../osmand/plus/activities/search/SearchHistoryFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 2be38f4ecc..7ada534fa1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -80,7 +80,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear double lat = intent.getDoubleExtra(SEARCH_LAT, 0); double lon = intent.getDoubleExtra(SEARCH_LON, 0); if (lat != 0 || lon != 0) { - location = new LatLon(lat, lon); + historyAdapter.location = new LatLon(lat, lon); } } if (location == null && activity instanceof SearchActivity) { @@ -90,7 +90,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation(); } //TODO: Next line somehow breaks that distances are updated in list after origin is changed, but omitting it leads to no distences are shown upon first list view - //locationUpdate(location); + locationUpdate(location); clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE); } From 65f8b14505b52e23615fe0eacf4735639c9bb1f5 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 13:19:03 +0100 Subject: [PATCH 025/372] finalize fix for distance update issue for SearchHistory and SearchAddressOnline --- .../plus/activities/search/SearchAddressOnlineFragment.java | 5 ++--- .../osmand/plus/activities/search/SearchHistoryFragment.java | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java index 3b0954fe36..3e9861965e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java @@ -123,7 +123,7 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea double lat = intent.getDoubleExtra(SearchActivity.SEARCH_LAT, 0); double lon = intent.getDoubleExtra(SearchActivity.SEARCH_LON, 0); if(lat != 0 || lon != 0){ - location = new LatLon(lat, lon); + adapter.location = new LatLon(lat, lon); } } if (location == null && getActivity() instanceof SearchActivity) { @@ -132,8 +132,7 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea if (location == null) { location = settings.getLastKnownMapLocation(); } - //TODO: Next line somehow breaks that distances are updated in list after origin is changed, but omitting it leads to no distences are shown upon first list view - //locationUpdate(location); + locationUpdate(location); } @Override diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 7ada534fa1..8b7100571f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -89,7 +89,6 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear if (location == null) { location = ((OsmandApplication) activity.getApplication()).getSettings().getLastKnownMapLocation(); } - //TODO: Next line somehow breaks that distances are updated in list after origin is changed, but omitting it leads to no distences are shown upon first list view locationUpdate(location); clearButton.setVisibility(historyAdapter.isEmpty() ? View.GONE : View.VISIBLE); From 3d1792ede021cbe4af08378089af17d71f14088a Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 13:47:59 +0100 Subject: [PATCH 026/372] Document remaining bug which will only need fixing if we keep the tabbed search screen at all --- .../src/net/osmand/plus/activities/search/SearchActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index 8805abb714..c2a18f93fc 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -347,6 +347,9 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo this.searchPoint = searchPoint; for(WeakReference ref : fragList) { Fragment f = ref.get(); + //TODO: If we keep the tabbed search screen also: Looks like the following code does not update the searchPoint on search tabs other than on the last used tab (which will be shown again first). + // So if user starts the tabbed search screen, then changes the search origin, then changes the tab to e.g. the search coordinates or search history, the (changed) origin displayed in the headline will initially not be the one used by the new tab. + // (Changing the origin again on that tab will correct the situation) if(f instanceof SearchActivityChild) { if(!f.isDetached()) { ((SearchActivityChild) f).locationUpdate(searchPoint); From f42567bd2c6a3a3929c7b0aec75d3b68334c9a7c Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 19:58:05 +0100 Subject: [PATCH 027/372] remove obsolete line --- OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 1098466ada..59ea76be4a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -194,7 +194,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca // inst.setTime(new Date()); // final String textVersion = "\u00A9 OsmAnd " + inst.get(Calendar.YEAR); // textVersionView.setText(textVersion); - final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE); +// final SharedPreferences prefs = getApplicationContext().getSharedPreferences("net.osmand.settings", MODE_WORLD_READABLE); // textVersionView.setOnClickListener(new OnClickListener(){ // int i = 0; // @Override From 4a38cb266e057907a2606ab58f4f31ea7281b14d Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Tue, 30 Dec 2014 15:39:25 +0100 Subject: [PATCH 028/372] Translated using Weblate (Greek) Currently translated at 92.5% (1476 of 1595 strings) --- OsmAnd/res/values-el/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 405bbba34b..357a17e331 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -452,10 +452,10 @@ Διεύθυνση… Αγαπημένα… Ακαθόριστο - Βρέθηκε + Τρέχουσα θέση… Τελευταία οπτική χάρτη - Αναζήτηση κοντά: + Πηγή: Αναζήτηση εδώ κοντά "Πρόσφατες αλλαγές στην 0.6.7 : \n\t- Offline data manager (download, διαγραφή, activate / deactivate offline data directly in OsmAnd) @@ -1452,7 +1452,7 @@ Παρακολούθηση OpenStreetMap Συνδεδεμένες συσκευές Ομάδες/συσκευές OsMo - Αναμονή εξουσιοδότησης... + Αναμονή εξουσιοδότησης… Μοναδικό αναγνωριστικό συσκευής Υπολογισμός διαδρομής μεταξύ σημείων Εμφάνιση της θέσης πάντα στο κέντρο @@ -1528,7 +1528,7 @@ Αποφυγή αυτοκινητόδρομων Όριο βάρους Καθορίσετε το βάρος του οχήματος που θα είναι επιτρεπτό στις διαδρομές - Αντιγραφή αρχείου (%s) στο νέο προορισμό... + Αντιγραφή αρχείου (%s) στο νέο προορισμό… Αντιγραφή αρχείων δεδομένων OsmAnd στο νέο προορισμό (%s) Αντιγραφή αρχείων δεδομένων OsmAnd Φορτηγό From 4c3cdc8d93baf22f8dcee3686aca42bcbe031152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Tue, 30 Dec 2014 16:44:15 +0100 Subject: [PATCH 029/372] Translated using Weblate (Korean) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ko/strings.xml | 139 +++++++++++++++---------------- 1 file changed, 69 insertions(+), 70 deletions(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index a7324bd720..a71976518a 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -101,7 +101,7 @@ 무료 OsmAnd 버전은 다운로드를 %1$s 번으로 제한되고 오프라인 위키피디아 기사를 제공하지 않습니다. 무료 버전 - POI 설명 보여주기 + POI 설명 표시 북아메리카 북아메리카 - 미국 @@ -124,11 +124,11 @@ 이전에 익스포트한 즐겨찾기에 대한 파일이 이미 존재합니다. 이 파일을 대체하시겠습니까? 특정 설정 프로필 기본 프로필 - 각 프로필마다 맵뷰어 와 라우팅 설정을 기억합니다. 여기에 기본 프로필을 설정합니다. + 각 프로필마다 맵뷰어 와 운행 설정을 기억합니다. 여기에 기본 프로필을 설정합니다. 운행 - 라우팅을 위한 옵션을 설정합니다 + 운행을 위한 옵션을 설정합니다 일반 설정 지도 관리 기기에 저장된 오프라인 지도를 다운로드하고 관리합니다 @@ -203,16 +203,15 @@ 모의주행 정지 모의주행 시작 - 0.6.8 버전에 대한 변경사항들 : + "0.6.8 버전에 대한 변경사항들 : \n\t- 완전히 재설계한 검색 (POI, 주소)! 주소 검색을 훨씬 빠르게 응답하도록 함. 여러가지 많은 옵션을 가진 단일 검색 인터페이스 생성. -\n\t- 넓은 지역 (나라)의 POI 이름 검색 구현 +\n\t- 넓은 지역 (나라)의 POI 이름 검색 구현 \n\t- 태블릿에 대한 깜박이는 맵 화면 수정 (이슈 641번) \n\t- 자동-중심 맵 보기 옵션 (이슈 356번) -\n\t- GPX 네비겨이션이 \'방향\' 으로 이동 및 \'방향 저장\' 이 \'About route\' 로 이동 -\n\t- POI 데이터가 .obf 파일에 포함됨 (01/10/11 이후 모든 다운로드 인덱스) -\n\t- 음성 안내 픽스 (GPS 위치 픽스, 첫번째 명령 생략) -\n\t- 몇몇 개선점들 - +\n\t- GPX 내비게이션이 \'방향\' 으로 이동 및 \'방향 저장\' 이 \'About route\' 로 이동 +\n\t- POI 데이터가 .obf 파일에 포함됨 (01/10/11 이후 모든 다운로드 인덱스) +\n\t- 음성 안내 픽스 (GPS 위치 픽스, 첫번째 명령 생략) +\n\t- 몇몇 개선점들 " 파일 이름을 바꿀 수 없습니다. 같은 이름을 가진 파일이 이미 존재합니다. GPX 경로 @@ -316,14 +315,14 @@ 최근 변경사항들 "0.6.6 버전에 대한 변경사항들 : \n\t- 음성 안내를 위한 Text To Speech 엔진 -\n\t- 지도 렌더러를 더욱 세밀하게 만듦 +\n\t- 지도 렌더링를 더욱 세밀하게 만듦 \n\t- 앱과 함께 패키지된 전세계 기본맵 -\n\t- 오프라인 길안내 조정 (실험적) -\n\t- GPX 길안내 옵션들 +\n\t- 오프라인 운행 조정 (실험적) +\n\t- GPX 운행 옵션들 \n\t- UI 개선 및 큰 버그 수정 " 사용하지 않음 새로운 데이터 풀기(Unpacking)… - 온라인 라우팅 서비스가 선택되었지만 인터넷이 연결되지 않았습니다. + 온라인 운행 서비스를 선택하였지만 인터넷 연결이 되지 않습니다. 지원되지 않은 언어 선택한 언어는 설치된 안드로이드 TTS (text-to-speech) 엔진이 지원되지 않습니다. 다른 TTS 엔진을 찾기 위해 구글마켓으로 가시겠습니까? 아니면 미리설정된 TTS 언어가 사용될 것입니다. 누락된 데이터 @@ -417,7 +416,7 @@ \n\nA marker box can be hidden again by long-clicking on it. " 도움말 - "OsmAnd는 많은 기능을 가진 네비게이션 앱입니다.\n기본적인 소개로서, 몇 가지 유용한 도움말을 [메뉴-도움말]에서 찾을 수 있습니다. " + "OsmAnd는 많은 기능을 가진 내비게이션 앱입니다.\n기본적인 소개로서, 몇 가지 유용한 도움말을 지도화면에서 [메뉴-도움말]에서 찾을 수 있습니다. " 다음 이전 @@ -434,8 +433,8 @@ 위치를 보기 위해 웹 브라우저 링크 %1$s 또는 안드로이드 인텐트 링크 %2$s 를 따라갑니다 위치 전송 위치 공유 - GPX 포인트 \'\'{0}\'\' 가 성공적으로 추가되었습니다 - 기록된 GPX 경로에 포인트 추가 + GPX 경유지 \'\'{0}\'\' 가 성공적으로 추가되었습니다 + 기록된 GPX 경로에 경유지 추가 GPX 경유지 추가 관리 배리어(Barrier) @@ -528,8 +527,8 @@ 벡터 렌더러 렌더링 스타일을 선택합니다 - POI 웹사이트 보기 - POI 전화 보기 + POI 웹사이트 표시 + POI 전화번호 표시 웹사이트 전화 필터 종류 @@ -595,7 +594,7 @@ 최대 대기시간 OsmAnd 절전 모드 운행 서비스 정지 GPS 위치 - OsmAnd 네비게이션 서비스 + OsmAnd 내비게이션 서비스 네트워크 GPS 초 @@ -606,7 +605,7 @@ 위치 제공자 오랫동안 위치를 추적하기 위해 백그라운드 서비스를 활성화합니다 절전 모드에서 실행 - 백그라운드 길안내 서비스를 위해 GPS가 켜져 있어야 합니다. + 절전모드 운행 서비스를 위해 GPS가 켜져 있어야 합니다. 필터 숨김 필터 보이기 필터 @@ -660,7 +659,7 @@ OK 대중교통 정류소를 지도에 표시합니다 대중교통 정류소 표시 - 네비게이션 앱 OsmAnd + 내비게이션 앱 OsmAnd POI 데이터가 성공적으로 업데이트되었습니다 ({0} 이 로드되었습니다) 지역 POI 목록을 업데이트하는 도중 오류가 발생하였습니다 서버로부터 데이터를 로드하는 도중 오류가 발생하였습니다 @@ -688,7 +687,7 @@ 다운로드할 최대 줌 레벨을 선택하세요 전체거리 %1$s, 여행시간 %2$d h %3$d m. 온라인 또는 오프라인 라우팅 서비스를 선택합니다 - 라우터 선택 + 운행 서비스 SD 카드에 있는 데이터 저장 폴더에 접근할 수 없습니다! {0} - {1} 을 다운로드할까요? {0} 에 대한 오프라인 데이터가 이미 존재합니다({1}). 업데이트할까요({2}) ? @@ -709,7 +708,7 @@ 전송 모드 : 먼저 목적지를 선택하세요 운행시작 - GPS 정보 + GPS Status 표시 오프닝 시간 변경사항 여는중… 변경사항 닫는중… @@ -755,14 +754,14 @@ 설정 현재 트랙을 SD 카드에 저장합니다 현재 트랙을 GPX 파일로 저장 - 운행하는 동안 트랙 레코딩을 저장하는 로깅 간격을 선택합니다 + 운행하는 동안 트랙 레코딩을 위한 로깅 간격을 선택합니다 운행중 로깅 간격 운행하는 동안 트랙을 GPX파일로 저장합니다 운행하는 동안 트랙을 GPX파일로 기록 맵 업데이트 타일 재로드 목적지 - 맵에 OpenStreetBugs 표시 + "OpenStreetBugs를 지도에 표시" OpenStreetBugs 표시 즐겨찾기 즐겨찾기에 추가 @@ -781,7 +780,7 @@ 맵의 3D 뷰 활성화 맵 3D 뷰 - POI를 맵에 표시합니다 (최근에 선택된 필터 사용) + POI를 지도에 표시합니다 (최근에 선택된 필터 사용) POI 표시 온라인소스 또는 캐시된 맵 타일 소스를 선택합니다 타일 맵 소스 @@ -821,7 +820,7 @@ DDD.DD DDD MM.MMM DDD MM SS.SS -맵에 표시 +지도에 보이기 취소 주소를 선택하세요 지역 @@ -944,7 +943,7 @@ 운행을 위해 맵뷰어에 표시된 경로를 사용하시겠습니까? 목적지로 추가 GPX 선택… - 목적지 선택 + 도착지 선택 지도에서 선택… 즐겨찾기… 경로 정보 @@ -965,7 +964,7 @@ 킷캣(KitKat) 버전 이후로 이전에 저장한 폴더 (%s)에 지도를 다운로드하고 업데이트 할 수 없습니다. \n저장 위치를 변경하고 모든 파일을 그곳에 복사하는 것을 허락하겠습니까? \n Note : 이전 파일은 그대로 유지됩니다. (그러나 수동으로 삭제할 수 있습니다)\n Note : 새로운 저장소는 OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. - OsmAnd에 새 목적지로 데이터 파일을 복사하겠습니까? OsmAnd가 새 폴더를 만들고 사용하려면 \'아니오\'를 선택하세요. + OsmAnd에 새 도착지로 데이터 파일을 복사하겠습니까? OsmAnd가 새 폴더를 만들고 사용하려면 \'아니오\'를 선택하세요. 새 도착지에 파일(%s)을 복사중… 새로운 도착지에 OsmAnd 데이터 파일을 복사중 (%s) OsmAnd 데이터 파일을 복사중 @@ -1044,7 +1043,7 @@ 웨일스어 경로 환경설정 운행 환경설정 - 자동차용 라우팅의 복잡한 출발지/도착지 2단계 라우팅 사용불가 + 자동차 운행의 복잡한 출발지/도착지 2단계 라우팅 사용불가 앱에서 볼 수있는 사용자 프로필를 선택합니다 나머지 요소 : %1$d OSM 변경 사항을 삭제하려고 합니다. 확실합니까? @@ -1070,7 +1069,7 @@ ~부터 : - 목적지 %1$s + 도착지 %1$s 목적지로 설정 먼저 도시나 거리를 선택 "Changes in 1.4: @@ -1082,7 +1081,7 @@ \n\t* SRTM 파일 삭제 \n\t* OSM 노트 지원 " 인근 도시에서 거리 검색 - 경유지는 목적지까지 가는 길에 경유지의 순서를 최적화하기 위해 재 정렬. + 경유지는 도착지까지 가는 길에 경유지의 순서를 최적화하기 위해 재 정렬. 정렬 (도어 투 도어) OSM 변경 파일이 성공적으로 생성되었습니다 %1$s 백업 OSM 변경 실패 @@ -1115,7 +1114,7 @@ 정식 버전 경로 해제 운행 중지 - 목적지 지우기 + 도착지 지우기 현재 와이파이(WiFi)가 연결되어 있지 않습니다. 현재의 인터넷 연결(3G)을 통해서 계속 다운로드 하시겠습니까? 거리 주택 수 @@ -1129,7 +1128,7 @@ 트랙을 기록하는 방법을 구성합니다 절전모드(스크린 끄기)에서 트래킹 및 경로탐색 활성화, 주기적으로 GPS 장치가 작동중일 때 . 표시 설정은 로컬 GPX 파일이나 웹 서비스를 사용하는 온라인에 트랙을 기록하는 설비 가능. 로깅 서비스 - 주기적으로 GPS 장치를 On 시켜 절전모드(스크린 끄기)에서 트래킹 및 라우팅을 가능하게 합니다. + 주기적으로 GPS 장치를 On 시켜 절전모드(스크린 끄기)에서 트래킹 및 운행을 가능하게 합니다. 앱 테마(색상)를 선택 앱 테마 접근성(내게 필요한) 옵션 @@ -1234,13 +1233,13 @@ \n\t* 향상된 라우팅(길찾기) : 더 빨리, 더 정확히, 최대 거리 250km \n\t* 도로 전용 지도 소개 \n\t* 지도는 중단 후 위치 잠금을 잃지 않는다 -\n\t* 길안내하는 동안 절전 모드 서비스를 활성화 " - "버전 0.8.4 의 변경 사항 : →\n\t* 일부 버그 수정 →\n\t* 지도는 중단 후 위치 잠금을 잃지 않는다 →\n\t* 길안내하는 동안 절전 모드 서비스를 활성화 " +\n\t* 운행하는 동안 절전 모드 서비스를 활성화 " + "버전 0.8.4 의 변경 사항 : →\n\t* 일부 버그 수정 →\n\t* 지도는 중단 후 위치 잠금을 잃지 않는다 →\n\t* 운행하는 동안 절전 모드 서비스를 활성화 " 변경세트 닫기 ZXing 바코드 스캐너 앱이 설치되어 있지 않습니다 . 구글시장에서 검색할까요 ? 도로 색상을 선택합니다: 도로 색상 - 목적지 방향 표시 + 도착지 방향 표시 트랙로깅 서비스(GPX 기록, 온라인 트래킹)를 사용하여 트래킹 플러그인을 활성화 장거리를 가능하게 하는 비-최적 경로 계산 설정에서 GPS를 활성화하십시오 @@ -1254,10 +1253,10 @@ 마지막 경유지로 추가 첫번째 경유지로 추가 - 목적지 대체 + 도착지로 대체 이미 목적지가 설정되었습니다. 경유지 - 도로에서 너무 멀리 떨어진 포인트 %1$s . + 도로에서 너무 멀리 떨어진 경유지 %1$s . 경유지에 도착했습니다 경유지로 추가 경유지 @@ -1271,15 +1270,15 @@ 숙소 레스토랑 관광 - 알람 보기… + 알람 표시… 트래픽 경고(속도 제한, 강제 정지, 속도 범프), 속도 카메라 경고 및 차선 정보를 구성합니다 GPS로 진행방향이 탐지되지 않을 때 나침반을 사용 나침반 사용 전용도로 회피 - 길안내할 동안 차량을 도로에 밀착시킴 + 운행하는 동안 차량을 도로에 밀착시킴 도로에 밀착 - OsmAnd 지도 및 네비게이션 - 글로벌 모바일 맵 뷰어 및 오프라인 및 온라인 OSM 지도를 위한 라우팅 + OsmAnd 지도 및 내비게이션 + 글로벌 모바일 맵 뷰어 및 오프라인 및 온라인 OSM 지도를 위한 운행 " OsmAnd (OSM 자동 라우팅 및 길안내 시스템) OsmAnd 글로벌 OpenStreetMap의 다양한 데이터에 접근할 수 있는 오픈 소스 라우팅 응용 프로그램입니다. \n모든 지도 데이터(벡터 맵 또는 타일 맵 ) 는 오프라인 사용을 위하여 휴대 전화 메모리 카드에 저장할 수 있습니다. \nOsmAnd는 또한 턴-바이-턴 음성 안내 등의 오프라인 및 온라인 라우팅(길찾기) 기능을 제공합니다. @@ -1301,8 +1300,8 @@ \n- 위키 백과 또는 오프라인 관심 장소에 액세스할 수 없음. \n\nOsmAnd 는 적극적으로 개발하고 우리의 프로젝트와 프로젝트의 추가 진행은 개발 자금을 재정 지원에 의존하고 새로운 기능을 testdriving 하고있다. \nOsmAnd+ 를 구입, 또는 특정 새로운 기능에 자금을 지원하거나 osmand.net 에 일반 후원을 부탁드립니다. " - OsmAnd+ 지도 및 네비게이션 - 글로벌 모바일 지도보기 및 오프라인 및 온라인 OSM 지도를 위한 라우팅 + OsmAnd+ 지도 및 내비게이션 + 글로벌 모바일 지도보기 및 오프라인 및 온라인 OSM 지도를 위한 운행 " OsmAnd + (OSM 자동 안내 및 안내 ) OsmAnd + 글로벌 OpenStreetMap의 다양한 (OSM) 데이터에 접근할 수 있는 오픈 소스 운행 응용 프로그램입니다. 모든 지도 데이터 (벡터 또는 타일 맵 ) 오프라인 사용에 대한 휴대 전화 메모리 카드에 저장할 수 있습니다. OsmAnd 또한 턴-바이-턴 안내 등의 오프라인 및 온라인 라우팅 기능을 제공합니다. OsmAnd+는 프로젝트를 지원하는 새로운 기능의 개발을 투자하고, 최신 업데이트를 받을 수 있도록 구입하여 사용할 수 있는 유료 응용 프로그램 버전입니다. \n\n핵심 기능 중 일부 : \n- 전체 오프라인 기능 (선택 폴더 에 저장 다운로드 벡터 또는 타일 지도 ) @@ -1393,7 +1392,7 @@ 맵 뷰어 - 레인 표시 + 차선 표시 비포장 도로 회피 뱃길 회피 회피하기… @@ -1421,7 +1420,7 @@ 주차 GPX 레코딩 속도 - 목적지 + 도착지 고도 가야할 시간 다음 턴 @@ -1433,9 +1432,9 @@ 화면이 잠김 알람(wake-up) 간격을 설정 : 속도 카메라 표시 - 트래픽 경고 표시 + 교통 경고 표시 유료 도로 회피 - 이전 길안내는 아직 끝나지 안났습니다. 계속 길안내를 받으시겠습니까? (%1$s 초) + 이전 운행은 아직 끝나지 안났습니다. 계속 운행을 하시겠습니까? (%1$s 초) 위치가 확정되면 경로를 찾을 것입니다 시간 분 @@ -1491,9 +1490,9 @@ 렌더링 모드 ~에 대한 지도를 최적화 줌 레벨에서 보여주기(등고선 데이터가 필요합니다): - 등고선 보이기 - 지도 세부사항 보이기 증가 - 지도 세부사항 보기 + 등고선 표시 + 지도 세부사항 표시 증가 + 지도 세부사항 표시 데이터로 길찾기 형식 : POI(관심지점) 검색 @@ -1502,7 +1501,7 @@ 교통 검색 즐겨 찾기 검색 검색한 기록 - OsmAnd 오프라인 라우팅은 일시적으로 사용할 수 없습니다. + OsmAnd 오프라인 라우팅을 일시적으로 사용할 수 없습니다. 왼쪽좌석 운전 왼쪽좌석 운전 국가를 선택합니다 오프라인 데이터를 다운로드 하거나 업데이트 하려면 여기를 클릭하십시오. 세부정보를 보려면 기존 아이템을 클릭하세요, 비활성화 하거나 삭제하려면 길게 누르세요. 기기에 남아있는 현재 데이터는 (%1$s free): @@ -1518,9 +1517,9 @@ 지도 표시를 구성합니다 접근성(내게 필요한) 기능에 대한 설정을 표시하기. 고급 설정 - 로컬 GPX 파일이나 온라인 웹 서비스를 사용하는 온라인을 기록하기 위해 설정기능을 표시합니다. + 로컬 GPX 파일이나 웹 서비스를 사용하는 온라인에 경로를 기록하기 위한 설정 기능을 표시합니다. 고급 지도 구성(지도 상세보기) 및 일부 장치 특성에 대한 설정을 표시합니다. - 경로 시뮬레이션 이나 렌더링 성능 표시와 같은 개발 및 디버깅 기능에 대한 설정을 표시합니다. + 모의 주행이나 렌더링 성능 표시와 같은 개발 및 디버깅 기능에 대한 설정을 표시합니다. 플러그인 활성화 또는 비활성화 하기위해 플러그인을 터치합니다.(OsmAnd는 재시작해야 합니다) 플러그인은 고급설정 및 추가기능을 활성화합니다 @@ -1613,8 +1612,8 @@ \n→ * 다른 사소한 수정 ↵ \n↵ \n* 1.2의 변경 사항 : ↵ -\n→ * 버그 수정 (라우팅 조정, 검색, AV 레코딩, 음성 지시, 일부 디스플레이 개선) ↵ -\n→ * 좀 더 쉽게 음영 기복도 오버레이 구성 (등고선 플러그인 필요) ↵ +\n→ * 버그 수정 (라우팅 조정, 검색, AV 레코딩, 음성 안내, 일부 디스플레이 개선) ↵ +\n→ * 좀 더 쉽게 음영 오버레이 구성 (등고선 플러그인 필요) ↵ \n→ * maps.google.com의 위치 링크 허용 ↵ \n→ * 새로운 위젯 (GPS 정보) ↵ \n→ * 최근 삼성 장치 등의 멀티 윈도우를 지원 ↵ @@ -1637,7 +1636,7 @@ \n\t* EGM96 geoid 오프셋 보정, GPS 고도 읽기 " 노트와 연결할 위치는 아직 정의되지 않았습니다. 지정된 위치에 노트를 할당하려면 \"위치 사용…\" "Changes in 0.8.3: -\n\t* 포인트 +\n\t* 경유지 \n\t* 향상된 경로 안내 \n\t* 경로를 생성하는 동안 전용도로를 회피하는 것을 허락하는 설정을 추가 \n\t* 지도에 자전거 도로의 유형을 추가 @@ -1781,8 +1780,8 @@ 도착 알림 도착 알림을 원하세요 ? 결코 - 정기적인 간격으로 라우팅 명령을 재실행 - 라우팅 명령을 반복 + 정기적인 간격으로 운행 명령을 다시 알리기 + 운행 명령을 반복 잘못된 포맷 : %s "OsMo 연결 문제 : " @@ -1809,12 +1808,12 @@ 위치 전송 %1$d (in buffer %2$d) 설정된 연결 : %1$s "1.8의 변경 사항 : -\n\n* GPX 트랙의 루트 지점 간의 경로를 계산 +\n\n* GPX 트랙의 지점 간 경로를 계산 \n* 국가 별 다운로드 레이아웃 변경 (로컬 이름 검색을 지원) \n* GPX / KML 가져 오기를 지원 (KML에서 GPX로 변환) \n* GPX 트랙 \"내 데이터\"로 이동 \n* GPX 트랙을 분할하고 고도차 / 속도를 확인 할 수 있습니다 -\n* 지연이후 자동으로 운행 시작 " +\n* 일정시간 지연이후 자동으로 운행 시작 " 포인트 사이의 경로를 계산 OsMo 세션 재시작 디버그 정보 @@ -1873,7 +1872,7 @@ 사용자 %1$s이(가) 그룹 %2$s에 합류합니다 "사용자 %1$s가 그룹 %2$s에 남습니다" - 그룹 알림 보기 + 그룹 알림 표시 사용자가 그룹에 참여 또는 해체 할때 토스트 메시지를 표시 GPX 경로가 비어있습니다 선택된 경로 @@ -1912,15 +1911,15 @@ 즐겨찾기 그룹으로 저장 경유지 선택 포인트 이름 - 운행중 줌 버튼 보기 - 줌 버튼 보이기 + 운행하는 동안 줌 버튼 표시 + 줌 버튼 표시 선택한 GPX 파일 없음. 이용 가능한 GPX 파일을 선택하려면 누르고 있어요. 선택을 취소합니다. - 보이기위해 선택 + 선택하여 표시 거리로 정렬 이름으로 정렬 지도에서 보기 - 목적지 + 도착지 다운로드 되지 않았습니다, 인터넷 연결을 체크하세요. 인증 실패 OsMo 인증 오류가 발생 했습니다: %1$s.\n임시로 서비스가 다운되었거나 또는 등록 만료가 되었습니다.\n신규 등록을 진행 하시겠습니까? @@ -1942,10 +1941,10 @@ 상세 접보 덜 상세 접근 제한 숨기기 - 접근 제한 보이기 + 접근 제한 표시 도로 등급 표시 도로 표면 표시 - 자전거 노선 보이기 + 자전거 경로 표시 계속 중지 GPS 절전 모드 활성화 From 30d148b9d22fa240956d1ef4ff13c4cab494c51b Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 21:15:37 +0100 Subject: [PATCH 030/372] remove obsolete string --- OsmAnd/res/values-de/strings.xml | 1 - OsmAnd/res/values/strings.xml | 1 - .../net/osmand/plus/activities/search/SearchActivity.java | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index e9f07cffcf..a77b1e0d76 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -612,7 +612,6 @@ Adresse… Favorit… Undefiniert - Aktueller Standort… Letzte Kartenposition Ausgangspunkt: diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index a36d860e4a..7c3da0cce8 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1474,7 +1474,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Address… Favorites… Undefined - Current position… Last map view Origin: diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index c2a18f93fc..5d76b78043 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -169,7 +169,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true); + updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " "), true); } } } @@ -239,7 +239,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo searchAroundCurrentLocation = false; endSearchCurrentLocation(); if (position == POSITION_LAST_MAP_VIEW) { - updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true); + updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " "), true); } else if (position == POSITION_FAVORITES) { Intent intent = new Intent(SearchActivity.this, FavouritesListActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); @@ -286,7 +286,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo if(name != null){ updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + name, false); } else { - updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true); + updateSearchPoint(latLon, getString(R.string.select_search_position) + " "), true); } } } From c5a8e30230fd3f294b5ade4c4abd46a8d59c0942 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 21:21:39 +0100 Subject: [PATCH 031/372] fix build --- .../net/osmand/plus/activities/search/SearchActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index 5d76b78043..0b1cce9ffe 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -169,7 +169,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " "), true); + updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); } } } @@ -239,7 +239,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo searchAroundCurrentLocation = false; endSearchCurrentLocation(); if (position == POSITION_LAST_MAP_VIEW) { - updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " "), true); + updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " ", true); } else if (position == POSITION_FAVORITES) { Intent intent = new Intent(SearchActivity.this, FavouritesListActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); @@ -286,7 +286,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo if(name != null){ updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + name, false); } else { - updateSearchPoint(latLon, getString(R.string.select_search_position) + " "), true); + updateSearchPoint(latLon, getString(R.string.select_search_position) + " ", true); } } } From 072a12c2851f89d493ed0d5a6a8ded5cf90467d7 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 23:42:16 +0100 Subject: [PATCH 032/372] fix update origin issue when switching to coordinate tab --- .../plus/activities/NavigatePointFragment.java | 18 ++++++++++++++++++ .../plus/activities/search/SearchActivity.java | 3 --- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 8bb0054eab..5ee87bbb5e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -166,6 +166,24 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct @Override public void onResume() { super.onResume(); + private LatLon location; + Intent intent = getSherlockActivity().getIntent(); + if (intent != null) { + if (intent.hasExtra(SearchActivity.SEARCH_LAT) && intent.hasExtra(SearchActivity.SEARCH_LON)) { + double lat = intent.getDoubleExtra(SearchActivity.SEARCH_LAT, 0); + double lon = intent.getDoubleExtra(SearchActivity.SEARCH_LON, 0); + if (lat != 0 || lon != 0) { + location = new LatLon(lat, lon); + } + } + } + if (location == null && getActivity() instanceof SearchActivity) { + location = ((SearchActivity) getActivity()).getSearchPoint(); + } + if (location == null) { + location = settings.getLastKnownMapLocation(); + } + locationUpdate(location); } diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index 0b1cce9ffe..28bd34a9c4 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -347,9 +347,6 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo this.searchPoint = searchPoint; for(WeakReference ref : fragList) { Fragment f = ref.get(); - //TODO: If we keep the tabbed search screen also: Looks like the following code does not update the searchPoint on search tabs other than on the last used tab (which will be shown again first). - // So if user starts the tabbed search screen, then changes the search origin, then changes the tab to e.g. the search coordinates or search history, the (changed) origin displayed in the headline will initially not be the one used by the new tab. - // (Changing the origin again on that tab will correct the situation) if(f instanceof SearchActivityChild) { if(!f.isDetached()) { ((SearchActivityChild) f).locationUpdate(searchPoint); From 5c378d96dc86a37a9b74d37c268f8696448a20ac Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 23:47:59 +0100 Subject: [PATCH 033/372] fix build --- .../src/net/osmand/plus/activities/NavigatePointFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 5ee87bbb5e..0bd345daba 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -166,7 +166,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct @Override public void onResume() { super.onResume(); - private LatLon location; + LatLon location; Intent intent = getSherlockActivity().getIntent(); if (intent != null) { if (intent.hasExtra(SearchActivity.SEARCH_LAT) && intent.hasExtra(SearchActivity.SEARCH_LON)) { From dc7bfea9561660181798b0ad8201b022ef779eb3 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 30 Dec 2014 23:54:22 +0100 Subject: [PATCH 034/372] fix build --- .../src/net/osmand/plus/activities/NavigatePointFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 0bd345daba..120234fa34 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -167,6 +167,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct public void onResume() { super.onResume(); LatLon location; + OsmandApplication app = (OsmandApplication) getActivity().getApplication(); Intent intent = getSherlockActivity().getIntent(); if (intent != null) { if (intent.hasExtra(SearchActivity.SEARCH_LAT) && intent.hasExtra(SearchActivity.SEARCH_LON)) { @@ -181,7 +182,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct location = ((SearchActivity) getActivity()).getSearchPoint(); } if (location == null) { - location = settings.getLastKnownMapLocation(); + location = app.getSettings().getLastKnownMapLocation(); } locationUpdate(location); } From 2652230451296461bffcb8759f526bcfacca7109 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 00:02:00 +0100 Subject: [PATCH 035/372] initialize var --- .../osmand/plus/activities/NavigatePointFragment.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 120234fa34..ad2bc5220b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -166,7 +166,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct @Override public void onResume() { super.onResume(); - LatLon location; + LatLon location = null; OsmandApplication app = (OsmandApplication) getActivity().getApplication(); Intent intent = getSherlockActivity().getIntent(); if (intent != null) { @@ -187,7 +187,6 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct locationUpdate(location); } - @Override public void locationUpdate(LatLon loc) { if (view != null) { @@ -365,9 +364,8 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct latEdit.addTextChangedListener(textWatcher); lonEdit.addTextChangedListener(textWatcher); } - - + public void select(int mode){ try { LatLon loc = parseLocation(); @@ -474,7 +472,6 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct throw new IllegalArgumentException("coordinate=" + coordinate); } } - public static String convert(double coordinate, int outputType) { @@ -511,7 +508,5 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct sb.append(df.format(coordinate)); return sb.toString(); } - - } From d6c20dfc49a5517f5c7606b640c4dec56e15da71 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 00:23:08 +0100 Subject: [PATCH 036/372] try without intent --- .../activities/NavigatePointFragment.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index ad2bc5220b..eb75d32f32 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -168,16 +168,16 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct super.onResume(); LatLon location = null; OsmandApplication app = (OsmandApplication) getActivity().getApplication(); - Intent intent = getSherlockActivity().getIntent(); - if (intent != null) { - if (intent.hasExtra(SearchActivity.SEARCH_LAT) && intent.hasExtra(SearchActivity.SEARCH_LON)) { - double lat = intent.getDoubleExtra(SearchActivity.SEARCH_LAT, 0); - double lon = intent.getDoubleExtra(SearchActivity.SEARCH_LON, 0); - if (lat != 0 || lon != 0) { - location = new LatLon(lat, lon); - } - } - } + //Intent intent = getSherlockActivity().getIntent(); + //if (intent != null) { + // if (intent.hasExtra(SearchActivity.SEARCH_LAT) && intent.hasExtra(SearchActivity.SEARCH_LON)) { + // double lat = intent.getDoubleExtra(SearchActivity.SEARCH_LAT, 0); + // double lon = intent.getDoubleExtra(SearchActivity.SEARCH_LON, 0); + // if (lat != 0 || lon != 0) { + // location = new LatLon(lat, lon); + // } + // } + //} if (location == null && getActivity() instanceof SearchActivity) { location = ((SearchActivity) getActivity()).getSearchPoint(); } From 1cff6d94d1647b08097692e93fb0a9e4b98e4edb Mon Sep 17 00:00:00 2001 From: Max Martin Richter Date: Wed, 31 Dec 2014 00:22:49 +0100 Subject: [PATCH 037/372] Translated using Weblate (German) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-de/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index a77b1e0d76..97ee43efe7 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + Geschwindigkeitsbegrenzung Grenzkontrolle @@ -2040,7 +2040,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Orange Deutscher Straßenatlas Bahnübergang - Fußgänger + Fußgängerüberweg Eisenbahn-Übergänge anzeigen Fußgänger-Übergänge anzeigen Amerikanischer Straßenatlas From 0074272997aef0c7cb7bb6c366f05073a5a861be Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 00:39:14 +0100 Subject: [PATCH 038/372] try without intent condition in SearchHistory, too --- .../activities/search/SearchHistoryFragment.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 8b7100571f..58ec9dc26e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -75,14 +75,14 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear public void onResume() { super.onResume(); FragmentActivity activity = getActivity(); - Intent intent = activity.getIntent(); - if (intent != null) { - double lat = intent.getDoubleExtra(SEARCH_LAT, 0); - double lon = intent.getDoubleExtra(SEARCH_LON, 0); - if (lat != 0 || lon != 0) { - historyAdapter.location = new LatLon(lat, lon); - } - } + //Intent intent = activity.getIntent(); + //if (intent != null) { + // double lat = intent.getDoubleExtra(SEARCH_LAT, 0); + // double lon = intent.getDoubleExtra(SEARCH_LON, 0); + // if (lat != 0 || lon != 0) { + // historyAdapter.location = new LatLon(lat, lon); + // } + //} if (location == null && activity instanceof SearchActivity) { location = ((SearchActivity) activity).getSearchPoint(); } From 5b0bc3f9c40eb247f338441c3f1c521046a72593 Mon Sep 17 00:00:00 2001 From: Max Martin Richter Date: Wed, 31 Dec 2014 00:33:50 +0100 Subject: [PATCH 039/372] Translated using Weblate (German) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-de/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 97ee43efe7..1dd1a378c2 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -701,7 +701,7 @@ Wähle Overlay-Karte Karte schon installiert, Einstellungen werden aktualisiert Kartenauswahl (Installation oder Aktualisierung) - Internet Verbindung erforderlich aber nicht verfügbar! + Internet Verbindung erforderlich, aber nicht verfügbar! Weitere installieren… Offline-Karten Aktuelles Kartenmaterial ist wichtig für die Offline-Kartenansicht, die POI und Adresssuche, und die Offline-Navigation. OsmAnd hat einen Karten-Manager für das Herunterladen oder Aktualisieren von Offline-Karten. @@ -1585,7 +1585,7 @@ Meine Favoriten Meine Orte Meine Orte - Lade %1$s … + Lade %1$s… Aktuelle Zeit \n\nZur Darstellung auf der Karte Antippen und Halten Navigation automatisch starten @@ -1954,7 +1954,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an GPX-Datei erfolgreich gespeichert unter {0} Berechnen des ersten und letzten Abschnitts der OsmAnd-Route Fehlende Karten herunterladen: %1$s (%2$d MB)? - Mehr... + Mehr… Bitte ID eingeben Ausgangsposition Bus-, Trolleybus-, Sammeltaxi-Linien @@ -2022,15 +2022,15 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Alle Daten aktuell OpenGL-Renderung verwenden Hardware beschleunigtes OpenGL-Rendering verwenden (Funktioniert nicht auf allen Geräten) - Herunterladen nicht möglich. Internet-Verbindung prüfen! + Herunterladen nicht möglich, bitte die Internet-Verbindung prüfen! Alle Downloads Aktualisierungen Lokal Beschriftungssprache ÖPNV-Haltestellen Zone - Nordwert - Ostwert + Rechtswert (y-Wert) + Hochwert (x-Wert) Möchten Sie Offline-Karten herunterladen? %1$s heruntergeladene Karten Neue Karte herunterladen From 3bd72aa7f3c01713090557659f91cb5660481d95 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 00:47:31 +0100 Subject: [PATCH 040/372] use precise German UCM expressions as per wikipedia --- OsmAnd/res/values-de/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 1dd1a378c2..9100d15a45 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + Geschwindigkeitsbegrenzung Grenzkontrolle @@ -2029,8 +2029,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Beschriftungssprache ÖPNV-Haltestellen Zone - Rechtswert (y-Wert) - Hochwert (x-Wert) + Nordwert (Hochwert) + Ostwert (Rechtswert) Möchten Sie Offline-Karten herunterladen? %1$s heruntergeladene Karten Neue Karte herunterladen From facc9fc92d87cfe5ab8863f1ca1dd9c3a8b22bbf Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 00:58:45 +0100 Subject: [PATCH 041/372] align with FavoritesListFrag for now --- .../activities/search/SearchHistoryFragment.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 58ec9dc26e..8b7100571f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -75,14 +75,14 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear public void onResume() { super.onResume(); FragmentActivity activity = getActivity(); - //Intent intent = activity.getIntent(); - //if (intent != null) { - // double lat = intent.getDoubleExtra(SEARCH_LAT, 0); - // double lon = intent.getDoubleExtra(SEARCH_LON, 0); - // if (lat != 0 || lon != 0) { - // historyAdapter.location = new LatLon(lat, lon); - // } - //} + Intent intent = activity.getIntent(); + if (intent != null) { + double lat = intent.getDoubleExtra(SEARCH_LAT, 0); + double lon = intent.getDoubleExtra(SEARCH_LON, 0); + if (lat != 0 || lon != 0) { + historyAdapter.location = new LatLon(lat, lon); + } + } if (location == null && activity instanceof SearchActivity) { location = ((SearchActivity) activity).getSearchPoint(); } From 942b2c64ece8322f77808387d6efec5685d62f95 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 09:56:02 +0100 Subject: [PATCH 042/372] align variable structure with that of analogue fragments --- .../activities/NavigatePointFragment.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index eb75d32f32..7f3aa88183 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -55,30 +55,29 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct private static final int SHOW_ON_MAP = 3; private static final int ADD_TO_FAVORITE = 4; - private View view; + private LatLon location; public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) { view = inflater.inflate(R.layout.navigate_point, container, false); setHasOptionsMenu(true); - LatLon loc = null; OsmandApplication app = (OsmandApplication) getActivity().getApplication(); Intent intent = getSherlockActivity().getIntent(); if(intent != null){ double lat = intent.getDoubleExtra(SEARCH_LAT, 0); double lon = intent.getDoubleExtra(SEARCH_LON, 0); if(lat != 0 || lon != 0){ - loc = new LatLon(lat, lon); + location = new LatLon(lat, lon); } } - if (loc == null && getActivity() instanceof SearchActivity) { - loc = ((SearchActivity) getActivity()).getSearchPoint(); + if (location == null && getActivity() instanceof SearchActivity) { + location = ((SearchActivity) getActivity()).getSearchPoint(); } - if (loc == null) { - loc = app.getSettings().getLastKnownMapLocation(); + if (location == null) { + location = app.getSettings().getLastKnownMapLocation(); } - initUI(loc.getLatitude(), loc.getLongitude()); + initUI(location.getLatitude(), location.getLongitude()); if(savedInstanceState != null && savedInstanceState.containsKey(SEARCH_LAT) && savedInstanceState.containsKey(SEARCH_LON) && currentFormat != UTM_FORMAT) { String lat = savedInstanceState.getString(SEARCH_LAT); @@ -166,7 +165,6 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct @Override public void onResume() { super.onResume(); - LatLon location = null; OsmandApplication app = (OsmandApplication) getActivity().getApplication(); //Intent intent = getSherlockActivity().getIntent(); //if (intent != null) { @@ -188,17 +186,18 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct } @Override - public void locationUpdate(LatLon loc) { + public void locationUpdate(LatLon l) { if (view != null) { - if (loc != null) { - showCurrentFormat(loc); + if (l != null) { + location = l; + showCurrentFormat(l); } else { showCurrentFormat(new LatLon(0, 0)); } } } - protected void showCurrentFormat( LatLon loc) { + protected void showCurrentFormat(LatLon l) { final EditText latEdit = ((EditText)view.findViewById(R.id.LatitudeEdit)); final EditText lonEdit = ((EditText)view.findViewById(R.id.LongitudeEdit)); boolean utm = currentFormat == UTM_FORMAT; @@ -211,13 +210,13 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct final EditText northingEdit = ((EditText)view.findViewById(R.id.NorthingEdit)); final EditText eastingEdit = ((EditText)view.findViewById(R.id.EastingEdit)); final EditText zoneEdit = ((EditText)view.findViewById(R.id.ZoneEdit)); - UTMPoint pnt = new UTMPoint(new LatLonPoint(loc.getLatitude(), loc.getLongitude())); + UTMPoint pnt = new UTMPoint(new LatLonPoint(l.getLatitude(), l.getLongitude())); zoneEdit.setText(pnt.zone_number + ""+pnt.zone_letter); northingEdit.setText(((long)pnt.northing)+""); eastingEdit.setText(((long)pnt.easting)+""); } else { - latEdit.setText(convert(MapUtils.checkLatitude(loc.getLatitude()), currentFormat)); - lonEdit.setText(convert(MapUtils.checkLongitude(loc.getLongitude()), currentFormat)); + latEdit.setText(convert(MapUtils.checkLatitude(l.getLatitude()), currentFormat)); + lonEdit.setText(convert(MapUtils.checkLongitude(l.getLongitude()), currentFormat)); } } From 70a70478dff0bdcb143327dc51727a2dc369e492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Wed, 31 Dec 2014 06:34:24 +0100 Subject: [PATCH 043/372] Translated using Weblate (Korean) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ko/strings.xml | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index a71976518a..f3329c278a 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -249,7 +249,7 @@ \n\t- 벡터 렌더링 개선 \n\t- TTS 엔진 개선 (정확한 거리 안내, 마일 활성화) \n\t- 버그 수정 " - 루트를 변환하여 GPX파일로 저장 + 경로를 GPX파일로 저장 경로가 \'%1$s\'로 성공적으로 저장되었습니다. 파일 이름 : 같은 이름의 파일이 이미 존재합니다. @@ -329,7 +329,7 @@ 선택한 언어에 대한 데이터가 설치되지 않았습니다. 설치하기 위해 구글마켓으로 가시겠습니까? GPX 길안내 반대로 가기 - 현재 목적지 사용 + 현재 도착지 사용 전체 경로를 따라 이동 이 위치에 대해 존재하는 오프라인 벡터 맵. @@ -537,8 +537,8 @@ 위치는 아직 알 수 없음 다운로드 대중교통 검색 - 대중교통 검색결과 (목적지 없음): - 대중교통 검색결과 (목적지에 {0}): + 대중교통 검색결과 (도착지 없음): + 대중교통 검색결과 (도착지에 {0}): 없음 대중교통 검색 재설정 @@ -643,7 +643,7 @@ 세로, 가로, 자동 오프닝 시간 형식은 편집을 지원하지 않습니다 새로운 규칙 추가 - 노선 + 경로 정류소 정류소들 @@ -706,7 +706,7 @@ 경로 표시 운행 시작 전송 모드 : - 먼저 목적지를 선택하세요 + 먼저 도착지를 선택하세요 운행시작 GPS Status 표시 오프닝 시간 @@ -724,11 +724,11 @@ POI GPX를 저장하는 도중 오류가 발생하였습니다 - 경로를 찾는 도중 오류 + 경로 탐색 도중 오류 경로를 찾는 도중 오류가 발생하였습니다 경로를 찾지 못하였습니다 새로운 경로를 찾았습니다, 거리 - 목적지에 도착하였습니다 + 도착지에 도착하였습니다 좌표가 유효하지 않습니다! OsmAnd 맵으로 되돌아감 닫기 @@ -941,7 +941,7 @@ 인터넷 연결없이 OsmAnd 경로 구간 계산 첫번째와 마지막 경로 구간 계산 운행을 위해 맵뷰어에 표시된 경로를 사용하시겠습니까? - 목적지로 추가 + 도착지로 추가 GPX 선택… 도착지 선택 지도에서 선택… @@ -960,7 +960,7 @@ 전용도로 회피 전용도로 회피하기 중량 제한 - 도로에 허가된 차량중량 지정하기 + 도로에 통행가능한 차량중량을 지정 킷캣(KitKat) 버전 이후로 이전에 저장한 폴더 (%s)에 지도를 다운로드하고 업데이트 할 수 없습니다. \n저장 위치를 변경하고 모든 파일을 그곳에 복사하는 것을 허락하겠습니까? \n Note : 이전 파일은 그대로 유지됩니다. (그러나 수동으로 삭제할 수 있습니다)\n Note : 새로운 저장소는 OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. @@ -968,7 +968,7 @@ 새 도착지에 파일(%s)을 복사중… 새로운 도착지에 OsmAnd 데이터 파일을 복사중 (%s) OsmAnd 데이터 파일을 복사중 - OsmAnd 오프라인 경로 계산하기 + OsmAnd 오프라인 경로를 계산 트럭 라우팅 환경설정 TTS에 대한 음성속도를 지정합니다 @@ -986,7 +986,7 @@ 자주 묻는 질문 (FAQ) 모두 삭제하기 먼저 경로를 계산하세요 - "탬색된 경로를 이용하여 모의주행하기 " + "탐색한 경로를 이용하여 모의주행 " GPX경로를 이용하여 모의주행하기 내 선택을 기억하기 GPS status @@ -1059,8 +1059,8 @@ 경유지 지우기 경유지 유지 이미 경유자를 설정했습니다. - 도착지 설정 - 출발지 설정 + ~까지 운행 + ~부터 운행 지도 : 위도 %1$.3f, 경도 %2$.3f 현재 위치 @@ -1070,7 +1070,7 @@ 도착지 %1$s - 목적지로 설정 + 도착지로 설정 먼저 도시나 거리를 선택 "Changes in 1.4: \n\t* 모든 곳을 방문하기 위한 최적화된 방식으로 포인트 순서 @@ -1094,7 +1094,7 @@ 포인트 GPX 파일 이름 GPX 파일이 성공적으로 {0} 에 저장 - 포인트 사이의 거리를 측정하기 위해 경로(또는 기존 GPX 파일을 수정/사용)를 생성합니다. GPX로 저장하여, GPX 경로를 이용할 수 있습니다. + 지점 사이의 거리를 측정하기 위해 경로(또는 기존 GPX 파일을 수정/사용)를 생성합니다. GPX로 저장하여, GPX 경로를 이용할 수 있습니다. 거리 계산 및 플래닝 도구 다시 표시하지 않음 편집 시작 @@ -1106,7 +1106,7 @@ 현재 작업이 완료 될 때까지 기다리십시오 나침반 흔들림을 방지하기 위해 칼만 필터를 사용 칼만 필터 사용 - 접근성 모드 : 먼저 목적지를 선택하세요 + 접근성 모드 : 먼저 도착지를 선택하세요 방위센서(GPS) 대신 나침반 값을 결정하는 지자기센서를 사용 지자기센서를 사용 기타 @@ -1154,8 +1154,8 @@ 등고선 데이터 오디오/비디오 데이터 운행을 중지하시겠습니까 ? - 목적지( 및 경유지)를지우겠습니까? - 고장없이 정확한 경로를 계산(라우팅) 할 수 있습니다. 현 단계에서는 거리가 한정되어있어 게다가 느립니다. + 도착지 (및 경유지) 를지우겠습니까? + 고장없이 정확한 경로를 계산(라우팅) 할 수 있습니다. 현 단계에서는 거리가 한정되어있고 게다가 느립니다. 정확한 라우팅 모드 표시 사진 %1$s of %2$s @@ -1254,7 +1254,7 @@ 첫번째 경유지로 추가 도착지로 대체 - 이미 목적지가 설정되었습니다. + 이미 도착지가 설정되었습니다. 경유지 도로에서 너무 멀리 떨어진 경유지 %1$s . 경유지에 도착했습니다 @@ -1397,7 +1397,7 @@ 뱃길 회피 회피하기… 유료도로, 비포장, 뱃길 회피하기 - 형광색상 노선 + 깜박이는 경로 축척(Ruler) 방향 보기 투명 스킨 @@ -1435,7 +1435,7 @@ 교통 경고 표시 유료 도로 회피 이전 운행은 아직 끝나지 안났습니다. 계속 운행을 하시겠습니까? (%1$s 초) - 위치가 확정되면 경로를 찾을 것입니다 + 위치가 확정되면 경로를 탐색합니다 시간 분 자동차를 ~에 주차했습니다 : @@ -1825,7 +1825,7 @@ 세션을 사용할 수 없습니다 , \'위치 전송하기\' 가 켜져 있는지 확인하시기 바랍니다 세션 공유 장치를 추적하기 위한 세션 URL(%1$s) - %2$s 목적지 장치를 연결하려면, %3$s 링크를 클릭하거나 tracker id(%1$s)를 지정하세요 + %2$s 대상 장치를 연결하려면, %3$s 링크를 클릭하거나 tracker id(%1$s)를 지정하세요 로깅 간격 위치를 전송하도록 시간 간격을 선택 하루 @@ -1895,7 +1895,7 @@ 포인트 %1$s 트랙 레코딩 %1$s -\n 루트 포인트 %2$s +\n 경로 포인트 %2$s %1$s\n 포인트 %1$s\n GPX경로 %2$s 현재 기록중인 트랙 @@ -2059,15 +2059,15 @@ \n* 지도에 텍스트 크기에 대한 별도의 줌 지원\n* 경로 이탈한 경우에 특별한 오디오 알림 지원 \n* OsMo 로그인 기능 \n* OsMo 버전 비 호환성 수정 " - 노선 (Routes) + 경로 (Routes) 기차 노선 - 트램 노선 + 전차 노선 택시 노선 공유 무궤도 전차 노선 버스 노선 지도에서 선택 도로 회피… - 트램과 기차 노선 + 전차 및 기차 노선 숨기기 화면 켜기 교차로에 접근할 때 전화 화면 켜기 From 1dcb7e1bcae0a9f59b58404a2efa6e6b16160faf Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 10:32:52 +0100 Subject: [PATCH 044/372] reinitialise location upon resume --- .../src/net/osmand/plus/activities/NavigatePointFragment.java | 4 +++- .../osmand/plus/activities/search/SearchHistoryFragment.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 7f3aa88183..bde0fb5470 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -61,7 +61,8 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct public View onCreateView(android.view.LayoutInflater inflater, android.view.ViewGroup container, Bundle savedInstanceState) { view = inflater.inflate(R.layout.navigate_point, container, false); setHasOptionsMenu(true); - + + location = null; OsmandApplication app = (OsmandApplication) getActivity().getApplication(); Intent intent = getSherlockActivity().getIntent(); if(intent != null){ @@ -165,6 +166,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct @Override public void onResume() { super.onResume(); + location = null; OsmandApplication app = (OsmandApplication) getActivity().getApplication(); //Intent intent = getSherlockActivity().getIntent(); //if (intent != null) { diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 8b7100571f..9a37e43462 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -40,7 +40,6 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear public static final String SEARCH_LON = SearchActivity.SEARCH_LON; private HistoryAdapter historyAdapter; - @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); @@ -74,6 +73,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear @Override public void onResume() { super.onResume(); + location = null; FragmentActivity activity = getActivity(); Intent intent = activity.getIntent(); if (intent != null) { From b52d24af8f18036be4c9754a2871e604d68660bf Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Wed, 31 Dec 2014 10:32:47 +0100 Subject: [PATCH 045/372] Translated using Weblate (Greek) Currently translated at 93.0% (1483 of 1594 strings) --- OsmAnd/res/values-el/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 357a17e331..212d046a2a 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -1671,4 +1671,11 @@ Απόρριψη ΕΜΦ ΧΑΡΤΗ ΕΜΦ ΌΛΩΝ - + Ανακοίνωση διαβάσεων πεζών + Διάβαση πεζών + Κανόνες δρομολόγησης v1.9 + Να μην χρησιμοποιηθούν οι κανόνες δρομολόγησης που εισήχθησαν στην έκδοση 1.9 + Θέλετε να κατεβάσετε χάρτες για χρήση εκτός σύνδεσης; + Διαχείριση + Θέλετε ο OsmAnd να αντιγράψει επίσης τα δεδομένα του στη νέα τοποθεσία; Επιλέξτε \'Όχι\' ώστε ο OsmAnd απλά να δημιουργήσει και να χρησιμοποιήσει τον νέο φάκελο. + From 128e26457da520f8d38f1c201f8bc9572f60ebc8 Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Wed, 31 Dec 2014 10:32:47 +0100 Subject: [PATCH 046/372] Translated using Weblate (Greek) Currently translated at 93.0% (1483 of 1594 strings) --- OsmAnd/res/values-el/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 212d046a2a..9ee02114a3 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -1678,4 +1678,5 @@ Θέλετε να κατεβάσετε χάρτες για χρήση εκτός σύνδεσης; Διαχείριση Θέλετε ο OsmAnd να αντιγράψει επίσης τα δεδομένα του στη νέα τοποθεσία; Επιλέξτε \'Όχι\' ώστε ο OsmAnd απλά να δημιουργήσει και να χρησιμοποιήσει τον νέο φάκελο. + Ζώνη From 8040b5ec5027e8dc0b13b909712cf791de1b1407 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 10:51:39 +0100 Subject: [PATCH 047/372] shorten de strings to better fit screens --- OsmAnd/res/values-de/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 9100d15a45..b71d158335 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2029,8 +2029,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Beschriftungssprache ÖPNV-Haltestellen Zone - Nordwert (Hochwert) - Ostwert (Rechtswert) + Nord-/Hochwert) + Ost-/Rechtswert) Möchten Sie Offline-Karten herunterladen? %1$s heruntergeladene Karten Neue Karte herunterladen From 6c343e242c4fdab9ed45f528ce0390d0fb62fb32 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 10:59:30 +0100 Subject: [PATCH 048/372] remove obsolete lines --- .../src/net/osmand/plus/activities/NavigatePointFragment.java | 2 +- .../osmand/plus/activities/search/SearchHistoryFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index bde0fb5470..8e3e858e38 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -191,7 +191,7 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct public void locationUpdate(LatLon l) { if (view != null) { if (l != null) { - location = l; + //location = l; showCurrentFormat(l); } else { showCurrentFormat(new LatLon(0, 0)); diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 9a37e43462..6cdafdf82f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -96,7 +96,7 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear @Override public void locationUpdate(LatLon l) { - location = l; + //location = l; if(historyAdapter != null) { historyAdapter.updateLocation(l); } From 8373ff4e872a12c824ba2ca04509844a32bee0a9 Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Wed, 31 Dec 2014 10:59:23 +0100 Subject: [PATCH 049/372] Translated using Weblate (Greek) Currently translated at 93.4% (1490 of 1594 strings) --- OsmAnd/res/values-el/strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 9ee02114a3..a1cad77ea1 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -1679,4 +1679,10 @@ Διαχείριση Θέλετε ο OsmAnd να αντιγράψει επίσης τα δεδομένα του στη νέα τοποθεσία; Επιλέξτε \'Όχι\' ώστε ο OsmAnd απλά να δημιουργήσει και να χρησιμοποιήσει τον νέο φάκελο. Ζώνη - + Δεν βρέθηκε παράκαμψη + Χρήση ασφαλούς σύνδεσης με τον διακομιστή + Προηγμένες + Άναμμα της οθόνης + Εναπομείναντα στοιχεία + Επιλέξτε το περιθώριο του ορίου ταχύτητας, πάνω από το οποίο θα ακούτε ηχητική προειδοποίηση. + From 6f2a322d2e189020172f8b616de31a1abcb5ce20 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 11:21:39 +0100 Subject: [PATCH 050/372] finalize fix for "tabswitch with origin changed" bug for coordinate and history search. Transport search still needs to be checked. --- .../src/net/osmand/plus/activities/NavigatePointFragment.java | 2 ++ .../osmand/plus/activities/search/SearchHistoryFragment.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 8e3e858e38..22c201dbaa 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -166,6 +166,8 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct @Override public void onResume() { super.onResume(); + + //Hardy: onResume() code is needed so that search origin is properly reflected in tab contents when origin has been changed on one tab, then tab is changed to another one. location = null; OsmandApplication app = (OsmandApplication) getActivity().getApplication(); //Intent intent = getSherlockActivity().getIntent(); diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java index 6cdafdf82f..d26a4f963f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java @@ -73,6 +73,8 @@ public class SearchHistoryFragment extends SherlockListFragment implements Sear @Override public void onResume() { super.onResume(); + + //Hardy: onResume() code is needed so that search origin is properly reflected in tab contents when origin has been changed on one tab, then tab is changed to another one. location = null; FragmentActivity activity = getActivity(); Intent intent = activity.getIntent(); From d6df9255136112dacec21798b49d5a178c0ab69e Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Wed, 31 Dec 2014 11:00:49 +0100 Subject: [PATCH 051/372] Translated using Weblate (Greek) Currently translated at 93.5% (1491 of 1594 strings) --- OsmAnd/res/values-el/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index a1cad77ea1..0821bb8b27 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -1685,4 +1685,5 @@ Άναμμα της οθόνης Εναπομείναντα στοιχεία Επιλέξτε το περιθώριο του ορίου ταχύτητας, πάνω από το οποίο θα ακούτε ηχητική προειδοποίηση. - + Αλλάχτηκε το όνομα του αγαπημένου σημείου σε %1$s για να αποφευχθούν διπλά ονόματα. + From 00bb7737781000047b2c718da278f5947d10be61 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 13:29:45 +0100 Subject: [PATCH 052/372] fix typo in string --- OsmAnd/res/values-de/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index b71d158335..0c6d23c645 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2029,8 +2029,8 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Beschriftungssprache ÖPNV-Haltestellen Zone - Nord-/Hochwert) - Ost-/Rechtswert) + Nord-/Hochwert + Ost-/Rechtswert Möchten Sie Offline-Karten herunterladen? %1$s heruntergeladene Karten Neue Karte herunterladen From c10f3ac2c137c45f705742cce537fe52a749e926 Mon Sep 17 00:00:00 2001 From: Aleksei Polkhirev Date: Wed, 31 Dec 2014 13:17:48 +0100 Subject: [PATCH 053/372] Translated using Weblate (Russian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index a468c9558f..5260314db3 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -277,7 +277,7 @@ Точка Текущее местоположение… Вид карты - Искать рядом: + Начало: Искать рядом Изменения в 0.6.7: \n\t- Менеджер локальных данных (просмотр, удаление, создание архива данных прямо в OsmAnd) From e4cd6803acadd6475db294a73a84d51e00f49641 Mon Sep 17 00:00:00 2001 From: User99gmxat Date: Wed, 31 Dec 2014 14:51:34 +0100 Subject: [PATCH 054/372] Update German strings and small fixis --- OsmAnd/res/values-de/strings.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 0c6d23c645..03cc97a1ca 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + Geschwindigkeitsbegrenzung Grenzkontrolle @@ -1538,10 +1538,10 @@ \n Hinweis 1: Die ursprünglichen Dateien bleiben hiervon unberührt, können aber nachfolgend manuell gelöscht werden. \n Hinweis 2: Die Dateien können dann nicht mehr von OsmAnd und OsmAnd+ gemeinsam genutzt werden." Soll OsmAnd auch die Dateien an den neuen Speicherort verschieben? Mit \'Nein\' wird OsmAnd den neuen Speicherort nur anlegen und als Standard verwenden. - Kopieren der Datei (%s) an den neuen Speicherort… - Kopieren der OsmAnd-Dateien zum neuen Speicherort (%s) - Kopiere OsmAnd-Dateien - Berechne OsmAnd-Offline-Route + Datei (%s) an den neuen Speicherort kopieren… + OsmAnd-Dateien zum neuen Speicherort (%s) kopieren + OsmAnd-Dateien kopieren + OsmAnd-Offline-Route berechnen LKW Navigations-Einstellungen Einstellungen für Routenberechnung @@ -1563,7 +1563,7 @@ Position immer in Bildschirmmitte anzeigen Stimme Verschiedene - Teilen der Route als GPX-Datei + Route als GPX-Datei teilen Route über OsmAnd teilen Ländereinstellungen Musikwiedergabe unterbrechen @@ -1573,7 +1573,7 @@ Route zwischen Punkten berechnen Niemals Navigationsanweisungen in regelmäßigen Abständen wiederholen - Wiederholen von Navigationsanweisungen + Navigationsanweisungen wiederholen Zielankündigung Wann soll die Ankunft am Ziel angekündigt werden? Tage @@ -1585,7 +1585,7 @@ Meine Favoriten Meine Orte Meine Orte - Lade %1$s… + Lade %1$s … Aktuelle Zeit \n\nZur Darstellung auf der Karte Antippen und Halten Navigation automatisch starten @@ -1838,7 +1838,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Geräte-ID Konfigurieren der Überwachungs-Einstellungen und des persönlichen Überwachungs-Kanals - "Erweiterte OpenStreetMap-basierte Live-Überwachung, siehe http://osmo.mobi ... Ermöglicht die Positionsdarstellung in von einzelnen Geräten in Echtzeit. Bei anonym erstellten Gruppen sind die Optionen etwas eingeschränkt: Lebensdauer der Gruppe nur für einige Tage, auch ist keine zentrale Steuerung der Gruppe möglich. Es gibt verschiedene Einstellungen für zeitlich begrenzte oder Dauer-Aufzeichnung. Voll funktionsfähige Gruppen müssen auf der genannten Internetseite erstellt werden, auf die Gruppe haben nur registrierte Nutzer Zugriff. " + "Erweiterte OpenStreetMap-basierte Live-Überwachung, siehe http://osmo.mobi … Ermöglicht die Positionsdarstellung in von einzelnen Geräten in Echtzeit. Bei anonym erstellten Gruppen sind die Optionen etwas eingeschränkt: Lebensdauer der Gruppe nur für einige Tage, auch ist keine zentrale Steuerung der Gruppe möglich. Es gibt verschiedene Einstellungen für zeitlich begrenzte oder Dauer-Aufzeichnung. Voll funktionsfähige Gruppen müssen auf der genannten Internetseite erstellt werden, auf die Gruppe haben nur registrierte Nutzer Zugriff." OsMo (Erweiterte Live-Überwachung) OsMo OpenStreetMap-Überwachung OsMo Verbindungsproblem: @@ -2022,7 +2022,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Alle Daten aktuell OpenGL-Renderung verwenden Hardware beschleunigtes OpenGL-Rendering verwenden (Funktioniert nicht auf allen Geräten) - Herunterladen nicht möglich, bitte die Internet-Verbindung prüfen! + Herunterladen nicht möglich. Internet-Verbindung prüfen! Alle Downloads Aktualisierungen Lokal @@ -2040,11 +2040,11 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Orange Deutscher Straßenatlas Bahnübergang - Fußgängerüberweg - Eisenbahn-Übergänge anzeigen - Fußgänger-Übergänge anzeigen + Fußgängerübergang + Eisenbahnübergänge anzeigen + Fußgängerübergänge anzeigen Amerikanischer Straßenatlas Routing v1.9 nicht verwenden Neuen Routenalgorithmus nicht verwenden - Fußgänger-Übergänge ankündigen + Fußgängerübergänge ankündigen From df5ba1972979eed6fcbe63896d0d055f4a8642ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Wed, 31 Dec 2014 14:54:45 +0100 Subject: [PATCH 055/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-hu/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index de0a397034..70a96681d2 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1803,4 +1803,5 @@ Amerikai autós atlasz Nincsenek v1.9-es útvonalszabályok Ne használja az 1.9-es verzióban bevezetett útvonalszabályokat + Gyalogátkelőhelyek bejelentése From 3681d3480dcdc0abc6157c21b857e1ff9f4b3c92 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 16:24:07 +0100 Subject: [PATCH 056/372] start debugging transport search tab --- .../net/osmand/plus/activities/NavigatePointFragment.java | 2 +- .../plus/activities/search/SearchTransportFragment.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 22c201dbaa..fe25eefd98 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -191,9 +191,9 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct @Override public void locationUpdate(LatLon l) { + //location = l; if (view != null) { if (l != null) { - //location = l; showCurrentFormat(l); } else { showCurrentFormat(new LatLon(0, 0)); diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java index c24f99f194..67968163e9 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java @@ -52,15 +52,13 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA public static final String SEARCH_LON = SearchActivity.SEARCH_LON; private Button searchTransportLevel; - - + private TextView searchArea; private final static int finalZoom = 13; private final static int initialZoom = 17; private int zoom = initialZoom; private ProgressBar progress; - private LatLon lastKnownMapLocation; private LatLon destinationLocation; @@ -71,7 +69,6 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA private OsmandSettings settings; private View view; private AsyncTask asyncTask; - private OsmandApplication getApplication() { return (OsmandApplication) getActivity().getApplication(); @@ -140,7 +137,8 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA double lat = intent.getDoubleExtra(SEARCH_LAT, 0); double lon = intent.getDoubleExtra(SEARCH_LON, 0); if(lat != 0 || lon != 0){ - startPoint = new LatLon(lat, lon); + //This prevents origin update on this tab when switching to it after origin was changed on previous tab + //startPoint = new LatLon(lat, lon); } } if(startPoint == null && getActivity() instanceof SearchActivity){ From a5b6308948dfd689ff55a4ed5c5c5076c0f37fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Wed, 31 Dec 2014 14:59:54 +0100 Subject: [PATCH 057/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-hu/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 70a96681d2..c58f831236 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1193,7 +1193,7 @@ Kedvenc kiválasztása OSM módosítások Egyéb műveletek - Jelenleg nincs WiFi kapcsolat. Szeretnéd folytatni a letöltést a jelenlegi internetkapcsolattal? + Jelenleg nincs Wi-Fi kapcsolat. Szeretnéd a jelenlegi Internetkapcsolatot használni a letöltéshez? Útvonal elvetése Navigáció megállítása Cél törlése @@ -1368,7 +1368,7 @@ GPX kiválasztása… Válassz célpontot! Kiválasztás a térképen… - Kedvencek… + Kedvenc… Útvonal beállítások Útvonal információ Autópályák preferálása @@ -1607,7 +1607,7 @@ Rendezés távolság szerint Rendezés név szerint Megjelenítés térképen - Betöltés %1$s … + %1$s betöltése… Megtart Leállítás GPS alvó mód engedélyezése @@ -1761,7 +1761,7 @@ Képernyő bekapcsolása Az eszköz képernyőjének bekapcsolása egy kanyarodáshoz közeledve " Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (internetkapcsolat nélkül) is.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (plugin telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán & Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea, Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság " - " Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (internetkapcsolat nélkül) is.\n\nAz OsmAnd+ az alkalmazás fizetős változata. A megvételével támogatod a projektet, megalapozod új funkciók fejlesztését, és megkapod a legújabb frissítéseket. Ha vársárlás előtt kipróbálnád az alkalmazást, telepítsd az OsmAndot.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (plugin telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán & Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea, Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság " + " Az OsmAnd (OSM Automated Navigation Directions) egy térkép és navigációs alkalmazás, ingyenes, világméretű és jó minőségű OpenStreetMap (OSM) térképpel. Az összes térképadat offline tárolható az eszköz memóriakártyáján. GPS használatával az OsmAnd képes útvonaltervezésre, vizuális és hangnavigációra, mindezt autós, kerékpáros és gyalogos módban. Az összes főbb funkció működik online és offline (Internetkapcsolat nélkül) is.\n\nAz OsmAnd+ az alkalmazás fizetős változata. A megvételével támogatod a projektet, megalapozod új funkciók fejlesztését, és megkapod a legújabb frissítéseket. Ha vársárlás előtt kipróbálnád az alkalmazást, telepítsd az OsmAndot.\n\nNéhány főbb funkció:\n\nNavigáció\n- Működik online (gyorsabb) vagy offline (nincs internet roaming díj külföldön)\n- Turn-by-turn hangnavigáció felvett, vagy gépi hanggal (utóbbihoz TTS felolvasó szükséges)\n- Sávkijelzés, utcanévkijelzés, várható érkezési idő\n- Köztes útpontok megadásának lehetősége\n- Automatikus újratervezés, ha letértél az útról\n- Keresés helyekre cím alapján, típus szerint (étterem, hotel, benzinkút, múzeum), vagy koordináta alapján\n\nTérkép nézet\n- A pozíciód és irányod megjelenítése a térképen\n- A térkép forgatása választható iránytű, vagy mozgásirány alapján\n- Fontos helyek mentése Kedvencként\n- POI-k (érdekes helyek) megjelenítése a környékeden\n- Online (csempés) térképek megjelenítése\n- Műhold nézet (Bing)\n- Különféle rátét térképek állítható átlátszósággal, felvett GPX nyomvonalak\n- Helynevek megjelenítése saját nyelven, angolul, vagy fonetikus átírásban\n\nOpenStreetMap és Wikipédia adatok\n- Minőségi információk az egész világról a legjobb közösségi projektektől\n- OpenStreetMap térképek az egész földről országonkénti vagy régió szerinti bontásban\n- Wikipédia POI-k városnézéshez (nem elérhető az ingyenes verzióban)\n- Korlátlan ingyenes letöltés közvetlenül az alkalmazásból (az ingyenes verzióban 16 térképfájlra korlátozva)\n- Folyamatosan frissülő térképek (legalább havonta egyszer)\n- Kompakt offline vektoros térképek\n- Választható teljes térkép vagy csak úthálózat (például teljes Japán 700 MB, de az úthálózat csak 200 MB)\n- Támogatja az online vagy előre letárolt csempés térképeket\n\nBiztonsági funkciók\n- Választható automata nappal/éjjel nézet váltás\n- Választható sebességhatár kijelzés, túllépés esetén figyelmeztetéssel\n- Választható sebességfüggő nagyítás\n- Pozíciód megosztása, hogy a barátaid megtaláljanak\n\nKerékpáros és gyalogos funkciók\n- Szabadtéri tevékenységekhez a térképek tartalmazzák a gyalogos, túra, és kerékpáros ösvényeket\n- Külön gyalogos és kerékpáros tervezés és megjelenítés\n- Tömegközlekedési megállók vonalnevekkel\n- Utazás felvétele GPX fájlba vagy online szolgáltatásra\n- Sebesség és tengerszint feletti magasság megjelenítés\n- Szintvonalak és domborzatárnyékolás megjelenítése (bővítmény telepítése szükséges)\n\nKözvetlen OpenStreetMap közreműködés\n- Térképhibák jelentése\n- GPX nyomvonalak feltöltése OSM-re közvetlenül az alkalmazásból\n- POI-k felvétele és feltöltése közvetlenül OSM-be (vagy később offline)\n\nAz OsmAnd nyílt forráskódú és aktív fejlesztés alatt áll. Bárki közreműködhet hibák jelentésével, fordításokkal, vagy új funkciók fejlesztésével. A projekt haladása függ az anyagi hozzájárulásoktól is, megalapozva a fejlesztést, kódolást, és az új funkciók tesztelését. Az OsmAnd+ megvásárlásával segítheted, hogy az alkalmazás még szuperebb legyen! Az osmand.net-en lehetőség van konkrét funkció támogatására és általános adományozásra is.\n\nHozzávetőleges térképi lefedettség és minőség:\n- Nyugat-Európa: ****\n- Kelet-Európa: ***\n- Oroszország: ***\n- Észak-Amerika: ***\n- Dél-Amerika: **\n- Ázsia: **\n- Japán & Korea: ***\n- Közel-Kelet: **\n- Afrika: **\n- Antarktisz: *\n\nTámogatott országok listája (alapvetően az egész világ!):\nAfganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia, Angola, Anguilla, Antigua és Barbuda, Argentína, Aruba, Ausztrália, Ausztria, Azerbajdzsán, Bahamák, Bahrein, Banglades, Barbados, Belgium, Belize, Benin, Bhután, Bissau-Guinea, Bolívia, Bonaire, Bosznia és Hercegovina, Botswana, Brazília, Brit Virgin-szigetek, Brunei, Bulgária, Burkina Faso, Burundi, Chile, Ciprus, Comore-szigetek, Costa Rica, Curaçao, Csád, Csehország, Dánia, Dél-afrikai Köztársaság, Déli-Georgia, Dél-Szudán, Dominika, Dominikai Köztársaság, Dzsibuti, Ecuador, Egyesült Arab Emírségek, Egyesült Királyság, Egyiptom, El Salvador, Elefántcsontpart, Egyenlítői-Guinea, Eritrea, Észtország, Etiópia, Fehéroroszország, Fiji-szigetek, Finnország, Franciaország, Francia Polinézia, Fülöp-szigetek, Gabon, Gambia, Ghána, Gibraltár, Görögország, Grenada, Grönland, Grúzia, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guyana, Haiti, Hollandia, Holland Antillák, Honduras, Horvátország, Hongkong, India, Indonézia, Irak, Irán, Írország, Izland, Izrael, Jamaica, Japán, Jemen, Jersey, Jordánia, Kambodzsa, Kamerun, Kanada, Katar, Kazahsztán, Kelet-Timor, Kenya, Kína, Kiribati, Kirgizisztán, Észak Korea és Dél Korea, Kolumbia, Kongó, Koszovó, Közép-afrikai Köztársaság, Kuba, Kuvait, Laosz, Lengyelország, Lesotho, Lettország, Libanon, Libéria, Líbia, Lichtenstein, Litvánia, Luxemburg, Macedónia, Madagaszkár, Makaó, Magyarország, Malajzia, Malawi, Maldív-szigetek, Mali, Málta, Man-szigetek, Marokkó, Martinique, Mauritánia, Mauritius, Mayotte, Mexikó, Mianmar, Mikronézia, Moldova, Monaco, Mongólia, Montenegró, Monserrat, Mozambik, Namíbia, Nauru, Németország, Nepál, Nicaragua, Niger, Nigéria, Norvégia, Nyugat-Szahara, Olaszország, Omán, Oroszország, Örményország, Pakisztán, Palau, Palesztina, Panama, Pápua Új-Guinea, Paraguay, Peru, Portugália, Puerto Rico, Románia, Ruanda, Saint-Barthélemy, Szent Ilona, Saint Kitts és Nevis, Saint Lucia, Saint-Martin, Saint-Pierre és Miquelon, Saint Vincent és a Grenadine-szigetek, San Marino, Seychelle-szigetek, Sierra Leone, Spanyolország, Srí Lanka, Suriname, Svájc, Svédország, Szamoa, Szaúd-Arábia, Szenegál, Szerbia, Szingapúr, Szíria, Szlovákia, Szlovénia, Szomália, Szudán, Szváziföld, Tajvan, Tádzsikisztán, Tanzánia, Thaiföld, Tokelau-szigetek, Togo, Tonga, Törökország, Trinidad és Tobago, Tunézia, Tuvalu, Türkmenisztán, Uganda, Új-Kaledónia, Új-Zéland, Ukrajna, Uruguay, Üzbegisztán, Vanuatu, Vatikán, Venezuela, Vietnam, Wallis és Fortuna, Zambia, Zimbabwe, Zöld-foki Köztársaság " Az %1$s számára engedély szükséges a képernyő kikapcsolásához energiatakarékossági célból. Soha Nem található kerülőút From 94b809c823dc00e9794f9d6729a3b22625b3aa07 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 16:44:35 +0100 Subject: [PATCH 058/372] Document current workaround for search tab origin issue --- .../plus/activities/search/SearchTransportFragment.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java index 67968163e9..9af6dc0d5a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java @@ -137,7 +137,10 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA double lat = intent.getDoubleExtra(SEARCH_LAT, 0); double lon = intent.getDoubleExtra(SEARCH_LON, 0); if(lat != 0 || lon != 0){ - //This prevents origin update on this tab when switching to it after origin was changed on previous tab + // Not commenting out the next line will cause the follwing issue: + // (1) When the transport search was called from the dashboard, everything still works: You can change the search origin on the tab, this resets any previous (if any) search results, and any new searches will be centered around the new origin. + // (2) But when the tab was called from map screen, changing the search origin on the tab keeps any search results, does not reset anything. + // (3) If the search origin had been changed on anoother search tab before switching to this one, new transport searches would still center around the OLD search origin (the last map view) //startPoint = new LatLon(lat, lon); } } From ef58c5962055f9191a632a05372744b04e0b3f66 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 17:10:03 +0100 Subject: [PATCH 059/372] Fine tune english strings for public transport search --- OsmAnd/res/values/strings.xml | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 7c3da0cce8..6053764011 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -838,7 +838,7 @@ Advanced Mode… Parking Emergency - Public Transport + Public transport Entertainment Accommodation Restaurants @@ -876,7 +876,7 @@ - Complete offline functionality (store downloaded vector or tile maps in the device storage) - Compact offline vector maps for the whole world available - Download of country or region maps directly from the app - - Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transportation stops, additional maps with customizable transparency + - Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transport stops, additional maps with customizable transparency - Offline search for addresses and places (POIs) - Offline routing for short distances (experimental) - Car, bicycle, and pedestrian modes with: @@ -976,7 +976,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A - Compact offline vector maps for the whole world available - Unlimited downloading of country or region maps directly from the app - Offline Wikipedia feature (download Wikipedia POIs), great for sightseeing - - Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transportation stops, additional maps with customizable transparency + - Overlay of several map layers possible, like GPX or navigation tracks, Points of Interest, favorites, contour lines, public transport stops, additional maps with customizable transparency - Offline search for addresses and places (POIs) - Offline routing for short distances (experimental) - Car, bicycle, and pedestrian modes with: @@ -1181,7 +1181,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A POI (Point of interest) search Address search Coordinates - Transportation search + Public transport search Favorites search Search history OsmAnd offline navigation is temporarily not available. @@ -1192,7 +1192,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Position not yet known Modify transparency (0 - transparent, 255 - opaque) Do you want to interrupt file downloading? - Thank you for using OsmAnd. For many features of this application you need some regional offline data which you can download via \'Settings\' → \'Manage map files\'. Afterwards you will be able to view maps, locate addresses, look up POIs, and find public transportation. + Thank you for using OsmAnd. For many features of this application you need some regional offline data which you can download via \'Settings\' → \'Manage map files\'. Afterwards you will be able to view maps, locate addresses, look up POIs, and find public transport. Basemap is required for proper application functioning and was selected to download. Online and tile maps Offline maps (vector) @@ -1527,7 +1527,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Download POI data Address data - Transportation data + Public transport data Map data Deactivated Voice data (TTS) @@ -1655,11 +1655,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Sport Sustenance Tourism - Transportation + Transport Indexing address… Indexing map… Indexing POI… - Indexing transportation… + Indexing transport… I/O error occurred km km/h @@ -1719,11 +1719,11 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A High resolution display Do not stretch (and blur) map tiles on high density displays Download - Search transportation - Transportation results (no destination): - Transportation results ({0} to destination): + Search public transport + Transport results (no destination): + Transport results ({0} to destination): none - Reset Transportation search + Reset transport search Map Recorded voice Voice prompts @@ -1733,7 +1733,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A GPX track… Error reading GPX data Offline vector maps - Search transportation at stop + Search transport at stop Location:\n Lat %1$.5f\n Lon %2$.5f Bug Modify POI @@ -1759,13 +1759,13 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A No offline data for regions found on SD card. Download regions from the Internet. Input search query to find POI Any - Transportation route + Transport route Thanks to Yandex for traffic information. Yandex traffic Route Favorites OSM bugs (online) - Transportation stops + Transport stops POI… Map source… Map layers @@ -1822,18 +1822,18 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Routes Stop stops - Subsequent route - Prior route + Subsequent itinerary + Prior itinerary Finish search Choose stop to get off prior distance subsequent distance stops to pass - Route distance - Transportation + Itinerary distance + Transport OK - Show public transportation stops on map - Show transportation stops + Show public transport stops on map + Show transport stops Navigation application OsmAnd POI data was updated successfully ({0} were loaded) Error updating local POI list From cdeb8a54b8e484a2aa8b617c6522d3959a4e0e0b Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 31 Dec 2014 17:41:37 +0100 Subject: [PATCH 060/372] Translated using Weblate (Danish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-da/strings.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 1c2e64c93a..f8840bea9e 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -333,7 +333,7 @@ Søgning efter interessepunkt (IP) Adressesøgning Koordinater - Transportsøgning + Kollektivtrafiksøgning Favoritsøgning Søgehistorik OsmAnd offline navigation er midlertidig utilgængelig. @@ -345,7 +345,7 @@ Position endnu ikke kendt Ændre gennemsigtighed (0 - gennemsigtig, 255 - ugennemsigtig) Afbryd hentning af fil? - Til mange af funktionerne i programmet skal der bruges nogle regionale offline data som kan hentes via \'Indstillinger\' → \'Administrer kortfiler\'. Bagefter kan man se kort, søge adresser, finde interessepunkter (IP) og finde offentlig transport. + Til mange af funktionerne i programmet skal der bruges nogle regionale offline data som kan hentes via \'Indstillinger\' → \'Administrer kortfiler\'. Bagefter kan man se kort, søge adresser, finde interessepunkter (IP) og finde offentligtrafik. Basiskort er nødvendige for korrekt programfunktion og blev automatisk valgt. Fandt intet. Hvis man ikke kan finde sin region kan man lave den selv (se http://osmand.net). Online- og delkort @@ -692,7 +692,7 @@ Hent Adressedata - Transportdata + Kollektivtrafikdata Kortdata Deaktiveret Stemmedata (TTS) @@ -885,7 +885,7 @@ Højopløseligt visning Stræk (og slør) ikke delkort på skærme med stor opløsning Hent - Søg transport + Søg kollektivtrafik Transportresultater (ingen destination): Transportresultater ({0} til destination): ingen @@ -1014,12 +1014,12 @@ Stående, liggende eller som enhed Tilføj ny regel Ruter - Efterfølgende rute - Forudgående rute + Efterfølgende rejseplan + Forudgående rejseplan Afslut søgning tidligere afstand efterfølgende afstand - Rutelængde + Rejseplan afstand Transport Nej Ja @@ -1057,7 +1057,7 @@ Åbningstider format understøtter ikke redigering Vælg stoppestedet for afstigning stoppesteder der skal passeres - Vis stoppesteder for kollektivtransport på kortet + Vis stoppesteder for kollektivtrfikt på kortet Vis stoppesteder Navigationsprogram OsmAnd Interessepunkt-data blev opdateret ({0} blev indlæst) From eedb259152780f36a9bce5a10595f78dbefc6c7b Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Wed, 31 Dec 2014 17:31:27 +0100 Subject: [PATCH 061/372] Translated using Weblate (Russian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ru/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 5260314db3..17d1f81795 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -111,7 +111,7 @@ Определяем местоположение Изменить прозрачность (0 - прозрачный, 255 - непрозрачный) Прервать загрузку файла? - Для работы большинства основных возможностей приложения требуются детальные карты регионов, которые можно загрузить из Интернета с помощью пункта меню \"Настройки\" → \"Управление файлами карт\". После загрузки Вы сможете просматривать карты, осуществлять поиск адресов, POI и остановок общественного транспорта. + Для работы большинства основных возможностей приложения требуются детальные карты регионов, которые можно загрузить из Интернета с помощью пункта меню \"Настройки\" → \"Управление файлами карт\". После загрузки Вы сможете просматривать карты, осуществлять поиск адресов, POI и общественного транспорта. Базовая карта необходима для корректной работы приложения и автоматически была выбрана для загрузки. Ничего не было найдено. Вы можете создать карту самостоятельно (смотрите на osmand.net). Онлайн карты (растровые) @@ -330,7 +330,7 @@ POI Адрес - Транспорт + Данные публичного транспорта Карта Архивировано @@ -531,10 +531,10 @@ Дисплей высокого разрешения Не растягивать (с размытием) растровые карты на дисплеях высокого разрешения Загрузить - Искать транспорт + Искать общественный транспорт Искать транспорт на остановке - Искать транспорт (нет цели): - Искать транспорт (до цели {0}): + Результат поиска транспорта (нет цели): + Результ поиска транспорта (до цели {0}): Искать транспорт заново Карта Голосовые данные (запись) @@ -637,8 +637,8 @@ Остановка остановок нет - Маршрут после - Маршрут до + Последующий маршрут + Предыдущий маршрут Закончить поиск Выберите остановку идти после @@ -647,8 +647,8 @@ Длина пути Транспорт OK - Показать остановки транспорта на карте - Показать транспорт + Показывать остановки общественного транспорта на карте + Показать остановки транспорта Навигационное приложение OsmAnd Данные POI были успешно обновлены ({0} объектов загружено) Ошибка сохранения локальной POI @@ -981,7 +981,7 @@ Поиск POI Поиск по адресу Координаты - Поиск транспорта + Поиск общественного транспорта Поиск в избранном История поиска Отображать только границы многоугольников, без заливки From 47acf2ba8c25350f43ea2f2d7ae3251175ab4018 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Wed, 31 Dec 2014 17:29:38 +0100 Subject: [PATCH 062/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1594 strings) --- OsmAnd/res/values-sv/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 0e7f054bf0..e99fb0c725 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -137,7 +137,7 @@ Optimera karta för Adressökning Koordinater -Transportsökning +Kollektivtrafiksökning OsmAnd offlinenavigering är inte tillgänglig för tillfället. Vänstertrafik Välj för länder med vänstertrafik @@ -472,7 +472,7 @@ POI-data Adressdata -Transportdata +Kollektivtrafikdata Kartdata Inaktiverade Röstdata (TTS) @@ -690,7 +690,7 @@ Skärm med hög upplösning Sträck inte ut (och gör oskarpa) kartbitar på högupplösta skärmar Ladda ner - Sök transport + Sök kollektivtrafik Transportresultat (ingen destination): Transportresultat ({0} till destinationen): ingen @@ -797,14 +797,14 @@ Rutter Hållplats hållplatser - Följande rutt - Tidigare rutt + Följande resväg + Tidigare resväg Avsluta sökningen Välj hållplats att kliva av vid tidigare sträcka följande sträcka hållplatser att passera - Ruttavstånd + Resvägssträcka Transport OK Visa hållplatser för kollektivtrafik på kartan From f135eea2449b22dccac6646dc5e401a35c446636 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 31 Dec 2014 17:48:59 +0100 Subject: [PATCH 063/372] fine tune de strings which are actually status labels, not commands --- OsmAnd/res/values-de/strings.xml | 8 ++++---- OsmAnd/res/values/strings.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 03cc97a1ca..1997b6cf1c 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + Geschwindigkeitsbegrenzung Grenzkontrolle @@ -1538,9 +1538,9 @@ \n Hinweis 1: Die ursprünglichen Dateien bleiben hiervon unberührt, können aber nachfolgend manuell gelöscht werden. \n Hinweis 2: Die Dateien können dann nicht mehr von OsmAnd und OsmAnd+ gemeinsam genutzt werden." Soll OsmAnd auch die Dateien an den neuen Speicherort verschieben? Mit \'Nein\' wird OsmAnd den neuen Speicherort nur anlegen und als Standard verwenden. - Datei (%s) an den neuen Speicherort kopieren… - OsmAnd-Dateien zum neuen Speicherort (%s) kopieren - OsmAnd-Dateien kopieren + Datei (%s) wird an den neuen Speicherort kopiert… + OsmAnd-Dateien werden zum neuen Speicherort (%s) kopiert… + OsmAnd-Dateien werden kopiert… OsmAnd-Offline-Route berechnen LKW Navigations-Einstellungen diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 6053764011..5573099040 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -455,8 +455,8 @@ \n Note 1: Your old files will remain untouched (but can be deleted manually). \n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+. Copying file (%s) to the new destination… - Copying OsmAnd data files to the new destination (%s) - Copying OsmAnd data files + Copying OsmAnd data files to the new destination (%s)… + Copying OsmAnd data files… Calculate OsmAnd offline route Truck Navigation preferences From 74eab5f5c22e2b8084eff229f56852ee043c6a7b Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 10:43:40 +0100 Subject: [PATCH 064/372] try invalidate in DashUpdatesFragment --- OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 660bad87d2..0896758a6a 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -69,6 +69,9 @@ public class DashUpdatesFragment extends DashBaseFragment { cancelButton = null; } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); + + View view = getActivity().getLayoutInflater().inflate(R.layout.dash_updates_fragment, container, false); + view.invalidate(); } public void updatedDownloadsList(List list) { From d8395b5ba5c92110706728b92d83f10f076f8934 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Wed, 31 Dec 2014 19:01:53 +0100 Subject: [PATCH 065/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ca/strings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index d02c177aaf..121c2dd3d7 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -75,7 +75,7 @@ Format: Coordenades Cerca d\'adreces -Cerca de transports +Cerca de transport públic Cerca de preferits Cerca a l\'historial Conducció per l\'esquerra @@ -318,7 +318,7 @@ Baixa Dades dels PDI Dades d\'adreces -Dades de transports +Dades de transports públics Dades de mapes Desactivat Dades de veu (TTS) @@ -364,7 +364,7 @@ Esports Alimentació i beguda Turisme -Transports +Transport S\'estan indexant les adreces-… Indexant el mapa… S\'estan indexant els PDI … @@ -410,8 +410,8 @@ Llegint les tessel·les emmagatzemades… No s\'ha trobat la carpeta especificada. Carpeta d\'emmagatzematge de dades -" OsmAnd (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes vectorials i de mosaic, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa al dispositiu d\'emmagatzemament els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades - Limitacions d\'aquesta versió gratuïta de OsmAnd: - Limitació en el nombre de mapes baixats - No té accés als PDIs fora de línia de Viquipèdia L\'OsmAnd està en desenvolupament actiu i el nostre projecte i el seu futur progrés depenen de les donacions per ajudar al desenvolupament i proves de noves funcions. Si us plau, considereu la possibilitat de comprar l\'OsmAnd+ o bé fer una donació per impulsar una nova característica, o fer una donació de manera general a la pàgina osmand.net. " -" OsmAnd+ (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes de tessel·les i de vectors, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. L\'OsmAnd+ és la versió de pagament. Comprant-la estareu donant suport al projecte, ajudareu al desenvolupament de noves funcions i rebreu les darreres actualitzacions. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa en el dispositiu d\'emmagatzemament els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Disponibilitat fora de línia dels PDI baixats prèviament de Viquipèdia, és genial per fer turisme - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades " +" OsmAnd (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes vectorials i de mosaic, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa al dispositiu d\'emmagatzemament els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, parades de transport públic, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades - Limitacions d\'aquesta versió gratuïta de OsmAnd: - Limitació en el nombre de mapes baixats - No té accés als PDIs fora de línia de Viquipèdia L\'OsmAnd està en desenvolupament actiu i el nostre projecte i el seu futur progrés depenen de les donacions per ajudar al desenvolupament i proves de noves funcions. Si us plau, considereu la possibilitat de comprar l\'OsmAnd+ o bé fer una donació per impulsar una nova característica, o fer una donació de manera general a la pàgina osmand.net. " +" OsmAnd+ (OSM Automated Navigation Directions) L\'OsmAnd és una aplicació de navegació de codi obert amb accés a una gran varietat de dades de la col·lecció oberta de mapes OpenStreetMap. Totes les dades, incloent mapes de tessel·les i de vectors, poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús fora de línia. L\'OsmAnd també té la funcionalitat de càlcul de rutes tant en línia com fora de línia, incloent a més l\'orientació per veu. L\'OsmAnd+ és la versió de pagament. Comprant-la estareu donant suport al projecte, ajudareu al desenvolupament de noves funcions i rebreu les darreres actualitzacions. Algunes de les característiques centrals són: - Funcionalitat completa fora de línia (desa en el dispositiu d\'emmagatzemament els mapes vectorials i de mosaic baixats) - Mapes de vectors compactes de tot el món per usar fora de línia - Baixada il·limitada de mapes nacionals o regionals directament des de l\'aplicació - Disponibilitat fora de línia dels PDI baixats prèviament de Viquipèdia, és genial per fer turisme - Diverses capes de mapes alhora, com traces GPX o de navegació, PDIs, favorits, parades de transport públic, etc. amb nivell d\'opacitat personalitzada - Cerca fora de línia d\'adreces i llocs - Càlcul de rutes fora de línia per distàncies curtes (experimental) - Modalitats cotxe, bicicleta i vianant - Canvi automàtic de vista diürna a nocturna, opcional - Ampliació automàtica del mapa segons la velocitat, opcional - Alineació automàtica del mapa segons la brúixola o la direcció del moviment, opcional - Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades " "Canvis a la versió 0.8.1: \n\t* Rutes més precises (una mica més lent) \n\t* Torna a calcular rutes de manera intel·ligent i de pressa @@ -547,7 +547,7 @@ Descomprimint el fitxer… Baixar regions Orientació de pantalla -Ruta previa +Itinerari anterior Actualitzar PDI Cercant l\'adreça… Fora de línia @@ -869,7 +869,7 @@ LLegenda del mapa OSM en línia amb imatgesLa navegació fora de línia de l\'OsmAnd és una característica experimental i no funciona per distàncies superiors als 20Km.\n\nEl servei de navegació s\'ha desviat temporalment cap a CloudMade en línia. S\'ha produït una excepció: el renderitzador no s\'ha carregat - Cerca de transport + Cerca de transports públics Reinicia la cerca de transport Els mapes de vectors no s\'han carregat No s\'ha trobat cap fitxer GPX a la carpeta de traces @@ -887,10 +887,10 @@ Feu un gir en forma d\'U i continueu Cerca la darrera localització propera al mapa Parada - Ruta subsegüent + Itinerari subsegüent Finalitza la cerca distància subsegüent - Distància de la ruta + Longitud del itinerari Mostra les parades del transport públic al mapa Intersecció: {0} x {1} a {2} Preferit @@ -1349,8 +1349,8 @@ \n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir arxius entre l\'OsmAnd i l\'OsmAnd+." Voleu que l\'OsmAnd també copiï els seus arxius de dades a la nova destinació? Indiqueu «No» i l\'OsmAnd crearà i utilitzarà una carpeta nova. S\'està copiant el fitxer (%s) a la nova destinació… - S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s) - S\'estan copiant fitxers de dades de l\'OsmAnd + S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s)… + S\'estan copiant fitxers de dades de l\'OsmAnd… Calcula una ruta fora de línia amb l\'OsmAnd Camió "OsmAnd pot representar els mapes vectorials en diferents estils per tal d\'adaptar-se millor al que necessiteu: From e19e8ee98c28bbdad5a7b65c744999384aef5453 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 31 Dec 2014 19:56:57 +0100 Subject: [PATCH 066/372] Translated using Weblate (Danish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-da/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index f8840bea9e..c2578af4ca 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1453,8 +1453,8 @@ Beregn OsmAnd offline rute "Skal OsmAnd også kopiere datafiler til den nye placering? Vælg \'Nej\' hvis OsmAnd kun skal oprette og bruge den nye mappe." Kopierer fil (%s) til den ny placering… - Kopierer OsmAnd datafiler til ny destination (%s) - Kopierer OsmAnd datafiler + Kopierer OsmAnd datafiler til ny destination (%s)… + Kopierer OsmAnd datafiler… "Siden Android version 4.4 (KitKat) kan man ikke hente og opdatere kort i den tidligere lagerplacering (%s). Ønsker du at skifte til den tilladte placering og kopiere alle OsmAnd datafiler dertil?          \n Note 1: De gamle datafiler forbliver urørt. (men kan slettes manuelt).         \n Note 2: I den nye placering vil det ikke være muligt at dele filer mellem OsmAnd og OsmAnd+." From 63e869e8a71936275ff46f42d21ab5ca439eee5f Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Thu, 1 Jan 2015 07:27:22 +0100 Subject: [PATCH 067/372] Translated using Weblate (Italian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-it/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 93306d0bd2..f47ff99c5f 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1620,8 +1620,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz \n Nota: non sarà possibile condividere i files fra OsmAnd and OsmAnd+. Vuoi che OsmAnd sposti anche i propri dati nella nuova destinazione? Scegli \'No\' perché OsmAnd crei e utilizzi una nuova cartella. Copia in corso del file (%s) nella nuova destinazione… - Copia in corso dei file OsmAnd nella nuova destinazione (%s) - Copia dei file di dati di OsmAnd + Copia in corso dei file OsmAnd nella nuova destinazione (%s)… + Copia dei file di dati di OsmAnd… Calcola percorso OsmAnd offline Preferisci le autostrade Preferisci le autostrade From e37234ff6a4ba62c7ac6ea0f376b0bb0a7bd83b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Thu, 1 Jan 2015 07:59:07 +0100 Subject: [PATCH 068/372] Translated using Weblate (Korean) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ko/strings.xml | 110 +++++++++++++++---------------- 1 file changed, 52 insertions(+), 58 deletions(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index f3329c278a..1aeeeae95e 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -79,7 +79,7 @@ {0} POI/Bugs 가 업로드되었습니다 모두 업로드하기 - 지도에서 보기 + 지도에 표시 대량수정을 OSM에 업로드 대량수정 삭제 비동기 OSM 편집 : @@ -225,7 +225,7 @@ 서버가 현재 앱 버전과 호환되지 않는 지도 파일을 가지고 있습니다. 그것들을 다운로드하고 사용하기 위해, 앱을 새로운 버전으로 업그레이드 하세요. 이름 바꾸기 - 지도에서 보기 + 지도에 표시 온라인 지명 위치 검색중… 위치(발견) @@ -295,7 +295,7 @@ POI 데이터 주소 데이터 - 운송 데이터 + 대중 교통 데이터 지도 데이터 비활성화 @@ -336,9 +336,9 @@ \n\t\n\t사용하려면 [메뉴->계층 지도->맵 소스…->\'오프라인 벡터 맵] 을 활성화합니다. 음성 안내 출력 음성 안내를 재생할 채널을 선택합니다 (시스템 의존) - 음성 호출 오디오 - 오디오 알림 - 미디어/음악 오디오 + 음성 호출 스트림(통화음) + 소리 알림 + 미디어/음악 스트림(통화음) OsmAnd 앱이 계층 지도 %1$s 를 다운로드할 수 없으니, 재설치 하세요. 오버레이 맵 투명도를 수정합니다 오버레이 투명도 @@ -370,21 +370,15 @@ 최소 벡터 줌 레벨 위치 공유 - You can share the location of interesting places on your trip with family or friends via the \'Use location\' context menu → \'Share location\'. - -\t여행 도중 관심 지점의 위치를 가족 또는 친구와 공유할 수 있습니다. - \n\t원하는 위치를 공유하기 위해: - \n\t\'맵 컨텍스트 메뉴\' -> \'위치 공유\' 메뉴를 사용합니다. - - \n\nThen chose a way to share your location. The choices are: E-Mail, SMS(text), or just copy the location coordinates to the device clipboard. - - \n\t그런 다음 위치를 공유할 방법을 선택합니다. 선택사항에 따라: E-Mail, SMS(문자), 또는 클립보드로 위치 좌표를 복사합니다. - + "여행 도중 관심 지점의 위치를 가족 또는 친구와 공유할 수 있습니다. +\n\t원하는 위치를 공유하기 위해: +\n\t\'맵 컨텍스트 메뉴\' -> \'위치 공유\' 메뉴를 사용합니다. +\n\t그런 다음 위치를 공유할 방법을 선택합니다. 선택사항에 따라: E-Mail, SMS(문자), 또는 클립보드로 위치 좌표를 복사합니다. " 즐겨찾기 포인트 "자주 사용되는 포인트는 아래처럼 즐겨 찾기에 저장할 수 있습니다. ↵ \n\n포인트를 즐겨 찾기에 저장하려면 맵 컨텍스트 메뉴로 이동하여 \'즐겨 찾기에 추가\'옵션을 선택하고 이름을 붙여주세요. -\n\n즐겨 찾기 저장 후 \'메인 메뉴\'-> \'장소\'를 통해 사용할 수 있습니다. \'즐겨 찾기\'메뉴에서 즐겨 찾기를 길게 누르면 탐색 할 옵션이 나타나고, 편집 및 삭제할 수 있습니다. ↵ +\n\n즐겨 찾기 저장 후 \'메인 메뉴\'-> \'저장소\'를 통해 사용할 수 있습니다. \'즐겨 찾기\'메뉴에서 즐겨 찾기를 길게 누르면 탐색 할 옵션이 나타나고, 편집 및 삭제할 수 있습니다. ↵ \n\n지도에 직접 모든 즐겨 찾기 지점을 표시하려면 \'맵 컨텍스트 메뉴\'-> \'지도 구성\'의 \'즐겨 찾기\'레이어를 활성화하십시오. " 이미지와 함께 온라인 OSM 맵 분류 @@ -540,7 +534,7 @@ 대중교통 검색결과 (도착지 없음): 대중교통 검색결과 (도착지에 {0}): 없음 - 대중교통 검색 재설정 + 대중교통 재검색 지도 녹음된 음성 @@ -647,17 +641,17 @@ 정류소 정류소들 - 다음 경로 - 이전 경로 + 다음 교차로 + 이전 교차로 검색 종료 하차할 정류소 선택 이전 거리 이후 거리 경유할 정류소들 - 경로 거리 + 교처로까지 거리 대중교통 OK - 대중교통 정류소를 지도에 표시합니다 + 대중교통 정류소를 지도에 표시 대중교통 정류소 표시 내비게이션 앱 OsmAnd POI 데이터가 성공적으로 업데이트되었습니다 ({0} 이 로드되었습니다) @@ -699,7 +693,7 @@ 사용 가능한 지역 목록을 다운로드하는 중… 지역 목록을 osmand.googlecode.com 로부터 가져올 수 없습니다. 원하는 지역의 지도를 찾을 수 없으면, 직접 지도를 만들 수도 있습니다. http://osmand.net 를 참고하세요. - 지도에서 보기 + 지도에 표시 즐겨찾기 포인트가 수정되었습니다 즐겨찾기 포인트가 하나도 존재하지 않습니다 대체 @@ -796,7 +790,7 @@ 종료 지도 설정 -장소 +저장소 검색 검색 @@ -808,7 +802,7 @@ 목록에서 지역을 선택합니다 교차로를 선택합니다 가장 가까운 시설들 -지도 보기 +지도 찾아보기 자동차 자전거 보행자 @@ -966,8 +960,8 @@ \n Note : 이전 파일은 그대로 유지됩니다. (그러나 수동으로 삭제할 수 있습니다)\n Note : 새로운 저장소는 OsmAnd 와 OsmAnd+ 간에 파일을 공유 할 수 없습니다. OsmAnd에 새 도착지로 데이터 파일을 복사하겠습니까? OsmAnd가 새 폴더를 만들고 사용하려면 \'아니오\'를 선택하세요. 새 도착지에 파일(%s)을 복사중… - 새로운 도착지에 OsmAnd 데이터 파일을 복사중 (%s) - OsmAnd 데이터 파일을 복사중 + 새로운 도착지(%s)에 OsmAnd 데이터 파일을 복사중… + OsmAnd 데이터 파일을 복사중… OsmAnd 오프라인 경로를 계산 트럭 라우팅 환경설정 @@ -1124,8 +1118,8 @@          \n\t* 나침반을 안정화하기 위해 추가 설정          \n\t* 지도 화면에서 좌상단 버튼는 메뉴버튼을 대체 - 트랙 레코딩 - 트랙을 기록하는 방법을 구성합니다 + 경로 레코딩 + 경로를 기록하는 방법을 구성합니다 절전모드(스크린 끄기)에서 트래킹 및 경로탐색 활성화, 주기적으로 GPS 장치가 작동중일 때 . 표시 설정은 로컬 GPX 파일이나 웹 서비스를 사용하는 온라인에 트랙을 기록하는 설비 가능. 로깅 서비스 주기적으로 GPS 장치를 On 시켜 절전모드(스크린 끄기)에서 트래킹 및 운행을 가능하게 합니다. @@ -1152,7 +1146,7 @@ 시작 등고선 데이터 - 오디오/비디오 데이터 + 소리/영상 데이터 운행을 중지하시겠습니까 ? 도착지 (및 경유지) 를지우겠습니까? 고장없이 정확한 경로를 계산(라우팅) 할 수 있습니다. 현 단계에서는 거리가 한정되어있고 게다가 느립니다. @@ -1161,33 +1155,33 @@ 사진 %1$s of %2$s 사진 찍기 사진 찍기 - Dropbox 플러그인은 Dropbox 계정으로 GPX경로와 오디오/비디오 노트를 동기화 할 수 있습니다 . + Dropbox 플러그인은 Dropbox 계정으로 GPX경로와 소리/영상 노트를 동기화 할 수 있습니다 . 드롭박스 플러그인 순서 변경 등고선 추가 개발을 지원하기 위해 구글플레이에서 플러그인을 구입하시기 바랍니다 . 등고선 플러그인 요청에 대한 선택 - 비디오 녹화 - 오디오 녹음 + 영상 녹화 + 소리 녹음 기본 위젯의 동작을 선택합니다 기본 위젯 작업 - 비디오 출력 형식 선택 - 비디오 출력 형식 - 비디오에 시스템 레코더를 사용 + 영상 출력 형식 선택 + 영상 출력 형식 + 영상 촬영시 시스템 레코더를 사용 시스템 레코더 사용 사진에 대한 시스템 앱을 사용 카메라 앱을 사용 - 오디오 및 비디오 설정을 구성합니다 - 오디오/비디오 설정 + 소리 및 영상 설정을 구성합니다 + "소리/영상 설정 " "기록하는 동안 오류가 발생했습니다 " 카메라는 사용할 수 없습니다 - 오디오/비디오는 기록되고 있습니다. 정지하려면 AV 위젯을 누르면 됩니다. - 지정된 녹음기에서 오디오가 재생되고 있습니다.\n%1$s + 소리/영상은 기록되고 있습니다. 정지하려면 AV 위젯을 누르면 됩니다. + 지정된 녹음기에서 소리가 재생되고 있습니다.\n%1$s 외부 플레이어 열기 이 기록을 삭제하시겠습니까 ? 사용 불가능 - 오디오 녹음 - 비디오 녹화 + 소리 녹음 + 영상 녹화 레코딩 레이어 레코딩을 재생할 수 없습니다 레코딩 삭제 @@ -1196,13 +1190,13 @@ 레코딩 정지 A/V 찍기 - 오디오/비디오 노트 + 소리/영상 노트 오프라인 등고선에 대한 OsmAnd 플러그인 거리 측정 정지 - 오디오 노트 - 여행하는 동안 오디오/비디오 노트 기록하기 - 오디오/비디오 노트 + 소리 노트 + 여행하는 동안 소리/영상 노트 기록하기 + 소리/영상 노트 부분 등고선 오프라인 등고선 과 음영은 다운로드를 용이하게 한다. (설정→지도 관리→다운로드→ 원하는 지도 유형 선택) @@ -1498,7 +1492,7 @@ POI(관심지점) 검색 주소 검색 좌표 - 교통 검색 + 대중 교통 검색 즐겨 찾기 검색 검색한 기록 OsmAnd 오프라인 라우팅을 일시적으로 사용할 수 없습니다. @@ -1623,13 +1617,13 @@ \n\t* UI 재디자인 \n\t* 버그 수정 " "Changes in 1.1.2: -\n\t* 오디오/비디오 플러그인 개선사항 +\n\t* 소리/영상 플러그인 개선사항 \n\t* 사용성 고정 및 등고선 플러그인 재 구성 \n\t* 등고선 플러그인을 위한 음영 팩키지 \n\t* 버그 수정 " "Changes in 1.1.0: \n\t* 거리 계산 플러그인 -\n\t* 오디오/비디오 메모 플러그인 +\n\t* 소리/영상 노트 플러그인 \n\t* 등고선 플러그인 \n\t* 버그 수정 \n\t* 지도 세부정보아 함께 지도 스타일 옵션, 새 도로 스타일, @@ -1876,10 +1870,10 @@ 사용자가 그룹에 참여 또는 해체 할때 토스트 메시지를 표시 GPX 경로가 비어있습니다 선택된 경로 - 내 GPX경로 - 내 즐겨찾기 - 장소 - 장소 + 모든 경로 + 모든 즐겨찾기 + 저장소 + 저장소 "하위 경로 : %1$s " 거리: %1$s (%2$s points) 시작 시간: %1$tF, %1$tR @@ -1893,7 +1887,7 @@ 구간 %1$s 포인트 포인트 %1$s - 트랙 레코딩 + 레코딩 %1$s \n 경로 포인트 %2$s %1$s\n 포인트 @@ -1918,7 +1912,7 @@ 선택하여 표시 거리로 정렬 이름으로 정렬 - 지도에서 보기 + 지도에 표시 도착지 다운로드 되지 않았습니다, 인터넷 연결을 체크하세요. 인증 실패 @@ -1991,14 +1985,14 @@ 카메라 사진 크기 내부 카메라 사진 크기 선택 가까운 즐겨찾기 알리기 -지도 보기 +지도 찾아보기 자동차 자전거 보행자 더 보기… 누락된 지도 %1$s (%2$d MB) 를 다운로드 할까요? - 지도 화면에 하나의 버튼 터치로 경로를 저장 합니다. 로컬 GPX 파일 또는 웹 서비스를 사용하여 온라인에 여행을 기록하기 위해 설정을 보여줍니다. - 트랙 기록 + 지도 화면에 하나의 버튼 터치로 경로를 저장 합니다. 로컬 GPX 파일 또는 웹 서비스를 사용하여 온라인에 경로를 기록하기 위해 설정을 보여줍니다. + 경로 기록 h 경과시간 거리 From e8c8ac217f45d02294a13f04d4f3e6b9f2bee672 Mon Sep 17 00:00:00 2001 From: Aleksei Polkhirev Date: Wed, 31 Dec 2014 22:59:07 +0100 Subject: [PATCH 069/372] Translated using Weblate (Russian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ru/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 17d1f81795..1160fdd83f 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1414,7 +1414,7 @@ Настройки маршрутизации Грузовик Рассчитать оффлайновый маршрут OsmAnd - Копирование файлов данных OsmAnd + Копирование файлов данных OsmAnd… Скорость произношения Выберите профили, видимые в приложении Профили приложения @@ -1425,7 +1425,7 @@ \n Примечание 2: При переносе файлов в новое хранилище совместное использование файлов OsmAnd и OsmAnd+ не возможно. Хотите ли Вы, чтобы OsmAnd скопировал файлы данных на новое место? Выберите \"Нет\", чтобы OsmAnd только создал и использовал новую директорию. Копирование файла (%s) на новое место… - Копирование файлов данных OsmAnd на новое место (%s) + Копирование файлов данных OsmAnd на новое место (%s)… Изменения в 1.6: \n\t* Поддержка устройств с разрешением Full HD; \n\t* Поддержка прозрачного фона карты; From 9bb87f4e75266909884d1b29274ed691f0d6daa0 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Wed, 31 Dec 2014 23:22:41 +0100 Subject: [PATCH 070/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1594 strings) --- OsmAnd/res/values-sv/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index e99fb0c725..bb459ae591 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -585,7 +585,7 @@ Sport Näring Turism -Transport +Transporter Indexerar adresser … Indexerar kartan … Indexerar POI … @@ -805,7 +805,7 @@ följande sträcka hållplatser att passera Resvägssträcka - Transport + Transporter OK Visa hållplatser för kollektivtrafik på kartan Visa hållplatser @@ -1340,8 +1340,8 @@ \n OBS: På den nya lagringsplatsen kommer det inte att vara möjligt att dela filer mellan OsmAnd och OsmAnd+. Vill du att OsmAnd också ska kopiera datafilerna till den nya platsen? Välj \'Nej\' om du vill att OsmAnd ska skapa och använda den nya mappen. Kopierar filen (%s) till den nya platsen … - Kopierar OsmAnd-datafiler till den nya platsen (%s) - Kopierar OsmAnd-datafiler + Kopierar OsmAnd-datafiler till den nya platsen (%s) … + Kopierar OsmAnd-datafiler … Beräkna OsmAnd offline-rutt Lastbil Föredra motorvägar From 9119d86b05766d5f8dcf0814ca2cca23c041ecc0 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Wed, 31 Dec 2014 18:14:10 +0100 Subject: [PATCH 071/372] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index df2b63cdee..70847bf4d5 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -175,7 +175,7 @@ POI(興趣點)查尋 地址查尋 座標查尋 - 交通設施查尋 + 大眾運輸查尋 我的最愛查尋 歷史記錄查尋 OsmAnd 離線導航，暫時不能使用。 @@ -186,7 +186,7 @@ 未知地理位置 調整透明度(0 - 透明, 255 - 不透明) 您要中斷下載中的檔案嗎？ - 感謝您使用 OsmAnd。對於此應用程式的許多功能，您需要一些地區的離線資料，您可以透過\'設定\' -> \'管理地圖檔案\'來下載。之後您可瀏覽地圖、位置的地址、查看興趣點以及找到大眾運輸設施。 + 感謝您使用 OsmAnd。對於此應用程式的許多功能，您需要一些地區的離線資料，您可以透過\'設定\' -> \'管理地圖檔案\'來下載。之後您可瀏覽地圖、位置的地址、查看興趣點以及尋找大眾運輸。 底圖為某些特別的應用功能必需使用的，並且預設為下載。 找不到任何資料。如果您不能在您的區域找到，您可以自行製作(參考http://osmand.net)。 線上地圖圖磚 @@ -457,7 +457,7 @@ 興趣點資料 地址資料 - 交通設施資料 + 大眾運輸資料 地圖資料 已停用 語音資料(TTS) @@ -591,7 +591,7 @@ 運動 飲食 旅遊、住宿 - 交通設施 + 交通工具 地址索引… 地圖索引… 興趣點索引… @@ -658,9 +658,9 @@ 高解析顯示 不要伸展（模糊）在高解析螢幕上的地圖圖磚 下載 - 查尋交通運輸 - 交通設施結果(無目的地)： - 交通設施(有{0}到目的地)： + 查尋大眾運輸 + 交通運輸結果(無目的地)： + 交通運輸結果(有{0}到目的地)： 無 重置交通運輸查尋 地圖 @@ -671,7 +671,7 @@ GPX 軌跡… 讀取 GPX 資料錯誤 離線向量地圖 - 在終點查尋交通運輸 + 查尋交通運輸車站 位置：\n 緯度 %1$.5f\n 經度 %2$.5f 程式臭蟲 修改興趣點 @@ -693,13 +693,13 @@ 在 SD 卡上沒有該地區離線資料。由網路下載資料。 輸入查尋條件以查尋興趣點 任何 - 交通路線 + 交通運輸路線 感謝 Yandex 提供的交通資訊。 Yandex 的交通資訊 導航路線 我的最愛 OSM 錯誤(線上) - 車站、站牌 + 候車亭 興趣點… 地圖來源… 地圖圖層 @@ -760,7 +760,7 @@ 新增新規則 導航路線 停止 - 車站 + 站牌 後續路線 優先路線 查尋完成 @@ -1444,8 +1444,8 @@ 卡車 您想要將 OsmAnd 資料複製到新的目的地嗎？選擇否，OsmAnd 只建立和使用新的資料夾。 複製檔案 (%s) 到新的目的地… - 複製 OsmAnd 資料檔到新的目的地 (%s) - 複製 OsmAnd 資料檔案 + 複製 OsmAnd 資料檔到新的目的地 (%s)… + 複製 OsmAnd 資料檔案… OsmAnd 預估離線路線 由於 Android 4.4 (KitKat) 版本，您無法下載和更新地圖於之前的存儲檔案夾 (%s)。您是否想變更到允許的存儲位置並複製所有的 OsmAnd 檔案到那裡？ \n注意 1：您舊的檔案將保持不變（但可以手動刪除）。 From 418a6f868c902af240def6f47992965cd938815f Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 10:49:29 +0100 Subject: [PATCH 072/372] wrong reference --- OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 0896758a6a..660bad87d2 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -69,9 +69,6 @@ public class DashUpdatesFragment extends DashBaseFragment { cancelButton = null; } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); - - View view = getActivity().getLayoutInflater().inflate(R.layout.dash_updates_fragment, container, false); - view.invalidate(); } public void updatedDownloadsList(List list) { From f1915891ab3991d1163c14ab2e464df6000d954d Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 11:02:32 +0100 Subject: [PATCH 073/372] try other ref --- .../src/net/osmand/plus/dashboard/DashUpdatesFragment.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 660bad87d2..6e42629c2d 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -69,6 +69,11 @@ public class DashUpdatesFragment extends DashBaseFragment { cancelButton = null; } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); + + View mainView = getView(); + if (mainView != null) { + view.invalidate(); + } } public void updatedDownloadsList(List list) { From 365de22bdbed424a60160c5b2938bfef8130d791 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 11:09:22 +0100 Subject: [PATCH 074/372] correct variable name --- OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 6e42629c2d..9dc7a94476 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -70,8 +70,8 @@ public class DashUpdatesFragment extends DashBaseFragment { } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); - View mainView = getView(); - if (mainView != null) { + View view = getView(); + if (view != null) { view.invalidate(); } } From eb1810724df8e3323bad9f4805a4808929e404c4 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 11:26:28 +0100 Subject: [PATCH 075/372] try moving fix to MainMenuActivity --- .../src/net/osmand/plus/activities/MainMenuActivity.java | 5 +++++ .../net/osmand/plus/dashboard/DashUpdatesFragment.java | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 59ea76be4a..e6970ef69c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -176,6 +176,11 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca getLocationProvider().registerOrUnregisterCompassListener(true); // getLocationProvider().resumeAllUpdates(); } + + View view = getView(); + if (view != null) { + view.invalidate(); + } } @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 9dc7a94476..21f9b7d1ad 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -70,10 +70,11 @@ public class DashUpdatesFragment extends DashBaseFragment { } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); - View view = getView(); - if (view != null) { - view.invalidate(); - } + //This seems to fix the "list are empty when returning to Dashboard" issue, but should probably be called more globally + //View view = getView(); + //if (view != null) { + // view.invalidate(); + //} } public void updatedDownloadsList(List list) { From 6ebe6207d4bc78de2446ae50bed2dce87bfb5901 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Thu, 1 Jan 2015 11:26:39 +0100 Subject: [PATCH 076/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1594 strings) --- OsmAnd/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index bb459ae591..000330f9a5 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1735,7 +1735,7 @@ VISA KARTAN VISA ALLA Koordinater - "Det finns %1$s uppdatering(ar)" + Det finns %1$s uppdatering(ar) Hittar ingen förbifart Avvisa Alla filer är uppdaterade From 9f300e2754c5393a72491f9067e72bba814d166b Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 11:46:01 +0100 Subject: [PATCH 077/372] Try more central fix in DashBaseFragment --- .../net/osmand/plus/activities/MainMenuActivity.java | 9 +++++---- .../net/osmand/plus/dashboard/DashBaseFragment.java | 12 +++++++++++- .../osmand/plus/dashboard/DashUpdatesFragment.java | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index e6970ef69c..f6db2833d9 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -165,6 +165,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca } getLocationProvider().addCompassListener(this); getLocationProvider().registerOrUnregisterCompassListener(true); + ScrollView.invalidate(); } @Override @@ -177,10 +178,10 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca // getLocationProvider().resumeAllUpdates(); } - View view = getView(); - if (view != null) { - view.invalidate(); - } + //View view = getView(); + //if (view != null) { + // view.invalidate(); + //} } @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java index e137d983bc..0f2bd760c5 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java @@ -11,5 +11,15 @@ public class DashBaseFragment extends SherlockFragment { public OsmandApplication getMyApplication(){ return (OsmandApplication) getActivity().getApplication(); } - + + @Override + public void onResume() { + super.onResume(); + //Test if this works + View view = getView(); + if (view != null) { + view.invalidate(); + } + } + } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 21f9b7d1ad..78607e34e4 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -70,7 +70,7 @@ public class DashUpdatesFragment extends DashBaseFragment { } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); - //This seems to fix the "list are empty when returning to Dashboard" issue, but should probably be called more globally + //This seems to fix the "list are empty when returning to Dashboard" issue, but should probably be called more globally in MainMenuActivity or DashBaseFragment? //View view = getView(); //if (view != null) { // view.invalidate(); From bd7f2f7df64f88f47061f0e8e68d4dc7ff00afbc Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 11:51:57 +0100 Subject: [PATCH 078/372] import view --- OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 6 ------ OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index f6db2833d9..59ea76be4a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -165,7 +165,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca } getLocationProvider().addCompassListener(this); getLocationProvider().registerOrUnregisterCompassListener(true); - ScrollView.invalidate(); } @Override @@ -177,11 +176,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca getLocationProvider().registerOrUnregisterCompassListener(true); // getLocationProvider().resumeAllUpdates(); } - - //View view = getView(); - //if (view != null) { - // view.invalidate(); - //} } @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java index 0f2bd760c5..dee90221cd 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java @@ -2,6 +2,7 @@ package net.osmand.plus.dashboard; import com.actionbarsherlock.app.SherlockFragment; import net.osmand.plus.OsmandApplication; +import android.view.View; /** * Created by Denis on 24.11.2014. From 402e69d8df938797ac5ced8aa84bd8e31ae6f8a1 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 12:01:57 +0100 Subject: [PATCH 079/372] Final fix for "list are empty when returning to the Dashboard" issue --- OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java | 2 +- .../src/net/osmand/plus/dashboard/DashUpdatesFragment.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java index dee90221cd..16d4550ff1 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java @@ -16,7 +16,7 @@ public class DashBaseFragment extends SherlockFragment { @Override public void onResume() { super.onResume(); - //Test if this works + //This fixes the "list are empty when returning to the Dashboard" issue View view = getView(); if (view != null) { view.invalidate(); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 78607e34e4..660bad87d2 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -69,12 +69,6 @@ public class DashUpdatesFragment extends DashBaseFragment { cancelButton = null; } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); - - //This seems to fix the "list are empty when returning to Dashboard" issue, but should probably be called more globally in MainMenuActivity or DashBaseFragment? - //View view = getView(); - //if (view != null) { - // view.invalidate(); - //} } public void updatedDownloadsList(List list) { From bf6735b886115040ffab8224c54fb416496c6716 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 1 Jan 2015 14:12:56 +0300 Subject: [PATCH 080/372] Update phrases --- OsmAnd/res/values/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 815772a8c7..0bdaea723c 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -216,6 +216,7 @@ Surveillance Observatory Astronomical observatory + Tower Construction Works Mineshaft From 0f2417146e995e7a2861d496c3166b7cb6a1e5a2 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 1 Jan 2015 12:18:34 +0100 Subject: [PATCH 081/372] Translated using Weblate (Danish) Currently translated at 100.0% (608 of 608 strings) --- OsmAnd/res/values-da/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 09c8597904..9c9c5a3083 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -659,4 +659,5 @@ Tog (attraktion) Vandrutsjebane + Tårn From f56b1fd45379e2ce4e1fcf9bfe5157afe32e7adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Thu, 1 Jan 2015 12:20:07 +0100 Subject: [PATCH 082/372] Translated using Weblate (Korean) Currently translated at 100.0% (608 of 608 strings) --- OsmAnd/res/values-ko/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml index cd9dc16a17..73ca50892d 100644 --- a/OsmAnd/res/values-ko/phrases.xml +++ b/OsmAnd/res/values-ko/phrases.xml @@ -641,4 +641,5 @@ 기차 (명소) 워터 슬라이드 + 타워 From a97e3f9f404a00f1c320ec2c4b56bf82c64c72b1 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 12:22:23 +0100 Subject: [PATCH 083/372] Move invalidtae to list fragment,s does no seem to work in Base --- .../plus/activities/FavouritesListFragment.java | 6 ++++++ .../net/osmand/plus/dashboard/DashBaseFragment.java | 11 ----------- .../osmand/plus/dashboard/DashUpdatesFragment.java | 6 ++++++ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java index b0d1f70c1c..83b6da214a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java @@ -86,6 +86,12 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear } } locationUpdate(location); + + //This fixes the "all lists are empty when returning to the Dashboard" issue, but should likely be placed more centrally, like in MainMenuActivity? + View view = getView(); + if (view != null) { + view.invalidate(); + } } @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java index 16d4550ff1..f6411de761 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java @@ -2,7 +2,6 @@ package net.osmand.plus.dashboard; import com.actionbarsherlock.app.SherlockFragment; import net.osmand.plus.OsmandApplication; -import android.view.View; /** * Created by Denis on 24.11.2014. @@ -13,14 +12,4 @@ public class DashBaseFragment extends SherlockFragment { return (OsmandApplication) getActivity().getApplication(); } - @Override - public void onResume() { - super.onResume(); - //This fixes the "list are empty when returning to the Dashboard" issue - View view = getView(); - if (view != null) { - view.invalidate(); - } - } - } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 660bad87d2..5d209379bc 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -69,6 +69,12 @@ public class DashUpdatesFragment extends DashBaseFragment { cancelButton = null; } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); + + //This fixes the "all lists are empty when returning to the Dashboard" issue, but should likely be placed more centrally, like in MainMenuActivity? + View view = getView(); + if (view != null) { + view.invalidate(); + } } public void updatedDownloadsList(List list) { From f22240dd994ceaa2302508bb19020fb5108b3e8e Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 1 Jan 2015 14:50:42 +0300 Subject: [PATCH 084/372] Update phrases --- OsmAnd/res/values/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 3e1f568641..c7a2c035a1 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -384,6 +384,7 @@ Historic mine Monument Zoo + Aquarium Theme park Tourism attraction From 4ae7acd3f43ec53d1568bf28a929db574bdde9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Thu, 1 Jan 2015 12:55:36 +0100 Subject: [PATCH 085/372] Translated using Weblate (Korean) Currently translated at 100.0% (609 of 609 strings) --- OsmAnd/res/values-ko/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml index 73ca50892d..274f70a114 100644 --- a/OsmAnd/res/values-ko/phrases.xml +++ b/OsmAnd/res/values-ko/phrases.xml @@ -642,4 +642,5 @@ 워터 슬라이드 타워 + 아쿠아리움 From 6130ec93d433089cfa303323487116d0e5697188 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 13:02:24 +0100 Subject: [PATCH 086/372] Prior fix worked only sometimes, unclear why --- .../net/osmand/plus/activities/FavouritesListFragment.java | 6 ++++++ .../src/net/osmand/plus/dashboard/DashUpdatesFragment.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java index 83b6da214a..400096c23f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java @@ -57,6 +57,12 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear OsmandApplication app = (OsmandApplication) getApplication(); favouritesAdapter = new FavouritesAdapter(activity, app.getFavorites().getFavouritePoints()); setListAdapter(favouritesAdapter); + + //Ckeck if this fixes that lists are still sometimes empty when returning from the map screen + View view = getView(); + if (view != null) { + view.invalidate(); + } } private OsmandApplication getApplication() { diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 5d209379bc..5eb1a35e5b 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -58,6 +58,12 @@ public class DashUpdatesFragment extends DashBaseFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + //Ckeck if this fixes that lists are still sometimes empty when returning from the map screen + View view = getView(); + if (view != null) { + view.invalidate(); + } } @Override From fa02bdcf560fad6aaf1f5bdb78331eb4c759afc5 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 1 Jan 2015 13:21:20 +0100 Subject: [PATCH 087/372] Translated using Weblate (Danish) Currently translated at 100.0% (609 of 609 strings) --- OsmAnd/res/values-da/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 9c9c5a3083..7124334669 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -660,4 +660,5 @@ Vandrutsjebane Tårn + Akvarie From 4d9a2e871a8dfeae1980571c2514ad7fea93fa99 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 13:27:53 +0100 Subject: [PATCH 088/372] All invalidate() only solved the empty-list issue sometimes, while it still appeared on other occasions. So back out to make way for a better fix --- .../plus/activities/FavouritesListFragment.java | 12 ------------ .../osmand/plus/dashboard/DashUpdatesFragment.java | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java index 400096c23f..b0d1f70c1c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java @@ -57,12 +57,6 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear OsmandApplication app = (OsmandApplication) getApplication(); favouritesAdapter = new FavouritesAdapter(activity, app.getFavorites().getFavouritePoints()); setListAdapter(favouritesAdapter); - - //Ckeck if this fixes that lists are still sometimes empty when returning from the map screen - View view = getView(); - if (view != null) { - view.invalidate(); - } } private OsmandApplication getApplication() { @@ -92,12 +86,6 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear } } locationUpdate(location); - - //This fixes the "all lists are empty when returning to the Dashboard" issue, but should likely be placed more centrally, like in MainMenuActivity? - View view = getView(); - if (view != null) { - view.invalidate(); - } } @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 5eb1a35e5b..660bad87d2 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -58,12 +58,6 @@ public class DashUpdatesFragment extends DashBaseFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - //Ckeck if this fixes that lists are still sometimes empty when returning from the map screen - View view = getView(); - if (view != null) { - view.invalidate(); - } } @Override @@ -75,12 +69,6 @@ public class DashUpdatesFragment extends DashBaseFragment { cancelButton = null; } updatedDownloadsList(BaseDownloadActivity.downloadListIndexThread.getItemsToUpdate()); - - //This fixes the "all lists are empty when returning to the Dashboard" issue, but should likely be placed more centrally, like in MainMenuActivity? - View view = getView(); - if (view != null) { - view.invalidate(); - } } public void updatedDownloadsList(List list) { From 72c3e52fd72fb517fced338424a01a470258a6c9 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 1 Jan 2015 15:40:37 +0300 Subject: [PATCH 089/372] Update phrases --- OsmAnd/res/values/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index c7a2c035a1..32719a4e6d 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -217,6 +217,7 @@ Observatory Astronomical observatory Tower + Radar Construction Works Mineshaft From 7cd0464a617867063a4ff92ec0e372bedf0f722c Mon Sep 17 00:00:00 2001 From: xmd5a Date: Thu, 1 Jan 2015 16:04:19 +0300 Subject: [PATCH 090/372] Update phrases --- OsmAnd/res/values/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index 32719a4e6d..831af18ba4 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -217,6 +217,7 @@ Observatory Astronomical observatory Tower + Mast Radar Construction Works From 113e15622fd6ffdb8ef34b07ea38ba68b8b177f9 Mon Sep 17 00:00:00 2001 From: Jaroslav Lichtblau Date: Thu, 1 Jan 2015 13:53:14 +0100 Subject: [PATCH 091/372] Translated using Weblate (Czech) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-cs/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 57982ef573..bd8612a612 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -275,7 +275,7 @@ Data POI Addresy - Doprava + Údaje veřejné dopravy Mapová data Záloha @@ -480,7 +480,7 @@ Použít mapu s vysokým rozlišením pro jemné displeje Pozice ještě není známa Stáhnout - Hledat dopravu + Hledat veřejnou dopravu Hledání dopravy (žádný cíl): Hledání dopravy (cíl vzdálen {0}): nic @@ -867,7 +867,7 @@ Hledat body zájmu (POI) Hledat adresu Souřadnice - Hledat dopravu + Hledat veřejnou dopravu Hledat oblíbené místo Historie hledání Zobrazit všechny typy půdy průhledně @@ -1385,8 +1385,8 @@ s často kladenými otázkami. \n Poznámka 2: V novém úložišti nebude možné sdílet soubory mezi OsmAnd a OsmAnd+. Chcete aby OsmAnd také zkopíroval své datové soubory do nového cíle? Vybráním \'Ne\' OsmAnd pouze vytvoří a použije nový adresář. Kopírování souboru (%s) do nového umístění… - Kopírování datových souborů OsmAnd do nového umístění (%s) - Kopírování datových souborů OsmAnd + Kopírování datových souborů OsmAnd do nového umístění (%s)… + Kopírování datových souborů OsmAnd… Vypočítat OsmAnd offline trasu Kamion Nastavení navigace From 35313161ac3d50e4077d7672b966ae86efd29829 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 15:08:04 +0100 Subject: [PATCH 092/372] Try empty list fix in DashFavoritesFragment --- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 9068facdfe..c2ac591e90 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -76,6 +76,12 @@ public class DashFavoritesFragment extends DashBaseFragment { updateLocation(location); } setupFavorites(); + + //Ckeck if this fixes that lists are empty when returning from the map screen + View view = getView(); + if (view != null) { + view.invalidate(); + } } From 1d00253d35ebb11f4b16eb7021fa2d29a09cc771 Mon Sep 17 00:00:00 2001 From: Jur Kis Date: Thu, 1 Jan 2015 14:38:11 +0100 Subject: [PATCH 093/372] Translated using Weblate (Lithuanian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-lt/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 98b6dbb75e..3d2556de38 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -52,7 +52,7 @@ LV (Lankytinos vietos) paieška Adreso paieška Koordinatės - Transporto paieška + Viešojo transporto paieška Išsaugotų vietų paieška Paieškos istorija Vidinė (be interneto) OsmAnd navigacija laikinai neprieinama. @@ -341,7 +341,7 @@ Esama vieta… Paskutinė žiūrėta žemėlapio vieta - Kilmė: + Pradžia: Ieškoti netoliese nuo čia Pakeitimai 0.6.7 versijoje : \n\t- Parsiųstų duomenų valdymas (parsiųsti, ištrinti, aktyvuoti / deaktyvuoti parsiųstus duomenis tiesiogiai OsmAnd programoje) @@ -396,7 +396,7 @@ LV duomenys Adresų duomenys - Transporto duomenys + Viešojo transporto duomenys Žemėlapio duomenys Deaktyvuota @@ -616,9 +616,9 @@ Didelės raiškos ekranas Neištempti (ir nesulieti) žemėlapio lakštų didelės raiškos ekranuose Parsiųsti - Ieškoti transporto - Transporto rezultatai (ne iki tikslo): - Transporto rezultatai ({0} iki tikslo): + Ieškoti viešojo transporto + Transporto paieškos rezultatai (tikslas nerastas): + Transporto paieškos rezultatai ({0} iki tikslo): nėra Pradėti transporto paiešką iš pradžių Žemėlapis @@ -729,8 +729,8 @@ Maršruto ilgis Transportas Gerai - Rodyti viešo transporto stoteles žemėlapyje - Rodyti viešo transporto stoteles + Rodyti viešojo transporto stoteles žemėlapyje + Rodyti viešojo transporto stoteles Navigacijos programa OsmAnd LV duomenys buvo sėkmingai atnaujinti ({0} įkelta) Įvyko klaida atnaujinant vietinį LV sąrašą @@ -1473,8 +1473,8 @@ \n Pastaba: dalintis tais pačiais failais tarp OsmAnd ir OsmAnd+ nebus galima. Ar norite, kad OsmAnd perkeltų duomenis ir į naują saugyklą? Pasirinkite \"Ne\", jei norite, kad OsmAnd tik sukurtų ir naudotų naują folderį. Kopijuojami failai (%/s) į naują saugojimo vietą… - OsmAnd failai kopijuojami į naują vietą (%/s) - Kopijuojami OsmAnd failai + OsmAnd failai kopijuojami į naują vietą (%/s)… + Kopijuojami OsmAnd failai… Įtraukti kaip kelionės tikslą Pasirinkti GPX… Pasirinkti kelionės tikslą From 1000493d54fd97a9a2253c6b392ff8125a92d1f2 Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Thu, 1 Jan 2015 14:44:02 +0100 Subject: [PATCH 094/372] Translated using Weblate (Polish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-pl/strings.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index b15effc1e0..871c348d33 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -855,10 +855,10 @@ Online OSM map classification with images" Dane trasowania Format: - Wyszukaj POI + Wyszukiwanie POI Wyszukiwanie adresu Współrzędne - Wyszukaj transport + Wyszukiwanie transportu publicznego Wyszukaj w ulubionych Historia wyszukiwania "Ukryj wszystkie elementy mapy będące terenami ziemnymi" @@ -980,7 +980,7 @@ \n\t* \'Względem kompasu\' - Mapa będzie ciągle ustawiana zgodnie z kierunkiem wskazywanym przez kompas. OsmAnd to aplikacja nawigacyjna open source wspierająca mapy kafelkowe oraz wektorowe -" OsmAnd (OSM Automatyczne Nawigowanie Do celu) OsmAnd jest programem open source do nawigacji z dostępem do szerokiej gamy globalnych map OpenStreetMap (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu w użycia offline. OsmAnd oferuje również funkcjonalność routingu w trybie offline i online zawierającą zapowiedzi głosowe. Niektóre z podstawowych funkcji: - Funkcjonalnowanie w trybie offline (przechowuje pobrane mapy wektorowych lub kafelkowe w pamięci urządzenia) - Dostępne kompaktowe mapy w trybie offlinie dla całego świata - Pobieranie map kraju lub regionu bezpośrednio z aplikacji - Możliwość nakładania kilku warstw map, takich jak GPX lub tras nawigacji, ciekawe miejsc, ulubionych, linii konturu, przystanków komunikacji miejskiej, dodatkowe mapy z konfigurowalną przejrzystością - Wyszukiwanie Offline adresów i miejsc (POI) - Wyznaczanie w trybie Offline tras na krótkich dystansach (eksperymentalne) - Tryby samochodowy, rowerowy i pieszy z: - opcjonalnym automatycznym przełączaniem widoku dzień/noc - opcjonalnie skalowanie map w zależności od prędkości - opcjonalne wyrównanie map według kompasu lub kierunku ruchu - opcjonalne wyświetlanie wskazywanie pasów, ograniczeń prędkości, głosy nagrane i głowy TTS w bezpłatnej wersji OsmAnd: - limitowana liczba pobrań mapy - Brak dostępu do Wikipedii dla POI w trybie offline jest aktywnie rozwijany i dalszy rozwój jest uzależniony od wkładu pieniężnego na finansowanie rozwoju i testowania nowych funkcjonalności. Proszę rozważyć zakup OsmAnd + lub finansowanie konkretnych nowych funkcji lub dokonania ogólnej darowizny na osmand.net. " +" OsmAnd (OSM Automatyczne Nawigowanie Do celu) OsmAnd jest programem open source do nawigacji z dostępem do szerokiej gamy globalnych map OpenStreetMap (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu w użycia offline. OsmAnd oferuje również nawigację w trybie offline i online zawierającą zapowiedzi głosowe. Niektóre z podstawowych funkcji: - Funkcjonowanie w trybie offline (przechowuje pobrane mapy wektorowych lub kafelkowe w pamięci urządzenia) - Dostępne kompaktowe mapy w trybie offlinie dla całego świata - Pobieranie map kraju lub regionu bezpośrednio z aplikacji - Możliwość nakładania kilku warstw map, takich jak GPX lub tras nawigacji, ciekawe miejsc, ulubionych, linii konturu, przystanków komunikacji miejskiej, dodatkowe mapy z konfigurowalną przejrzystością - Wyszukiwanie Offline adresów i miejsc (POI) - Wyznaczanie w trybie Offline tras na krótkich dystansach (eksperymentalne) - Tryby samochodowy, rowerowy i pieszy z: - opcjonalnym automatycznym przełączaniem widoku dzień/noc - opcjonalnie skalowanie map w zależności od prędkości - opcjonalne wyrównanie map według kompasu lub kierunku ruchu - opcjonalne wyświetlanie wskazywanie pasów, ograniczeń prędkości, głosy nagrane i głowy TTS w bezpłatnej wersji OsmAnd: - limitowana liczba pobrań mapy - Brak dostępu do Wikipedii dla POI w trybie offline jest aktywnie rozwijany i dalszy rozwój jest uzależniony od wkładu pieniężnego na finansowanie rozwoju i testowania nowych funkcjonalności. Proszę rozważyć zakup OsmAnd + lub finansowanie konkretnych nowych funkcji lub dokonania ogólnej darowizny na osmand.net. " OsmAnd to aplikacja open source do nawigacji obsługująca mapy offline i online Autostrad Przyciągaj pozycję do drogi podczas nawigacji @@ -1553,9 +1553,9 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Ustawienia nawigacji Ustawienia obliczania trasy Ciężarówka - Kopiowanie pliku (%s) do nowej lokalizacji... - Kopiowanie plików OsmAnd do nowej lokalizacji (%s) - Kopiowanie plików OsmAnd + Kopiowanie pliku (%s) do nowej lokalizacji… + Kopiowanie plików OsmAnd do nowej lokalizacji (%s)… + Kopiowanie plików OsmAnd… Czy chcesz, aby OsmAnd skopiował też swoje dane do nowej lokalizacji? Wybierz \'Nie\', aby OsmAnd utworzył tylko nowy folder. Od wersji 4.4 KitKat nie można pobierać ani aktualizować map w poprzedniej lokalizacji (%s). Czy chcesz ją zmienić na lokalizację dozwoloną i skopiować do niej wszystkie pliki? \n Uwaga 1: Twoje stare pliki zostaną nienaruszone (mogą być usunięte manualnie). @@ -1574,10 +1574,10 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Unikaj autostrad Limit wagi Określ ograniczenie masy pojazdu dozwolone na drodze - Wybierz GPX … + Wybierz GPX… Wybierz cel podróży - Wybierz na mapie … - Ulubione … + Wybierz na mapie… + Ulubione… Ustawienia trasy Informacje o trasie Przelicz trasę offline w OsmAnd @@ -1685,7 +1685,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Automatycznie uruchom sesję trackera Osobisty identyfikator trackera Token sesji: %1$s - Oczekiwanie na autoryzację... + Oczekiwanie na autoryzację… Ustanowiono połączenie: %1$s Uruchom ponownie sesję OsMo Informacje debugowania @@ -1789,7 +1789,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Rozpocznij nawigację automatycznie wybrano Interwał podziału - Ładowanie %1$s … + Wczytywanie %1$s… Aktualny czas Punkt trasy Zapisz jako grupę ulubionych @@ -1855,13 +1855,13 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Chiński tradycyjny Trasy metra Pobrać brakujące mapy %1$s (%2$d MB)? - Więcej... + Więcej… Przeglądaj mapę Samochód Rower Pieszy Kolorowy kod typów budynków - Zaproś... + Zaproś… Czy chcesz opuścić grupę %1$s? Określ id Kontynuuj nawigację From 4c1e0638dae5f55797ab4703a6cc76f967b170be Mon Sep 17 00:00:00 2001 From: ace shadow Date: Thu, 1 Jan 2015 14:41:57 +0100 Subject: [PATCH 095/372] Translated using Weblate (Slovak) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-sk/strings.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 93a950b60b..54a8c23be7 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -376,7 +376,7 @@ POI údaje Adresné údaje - Dopravné údaje + Údaje hromadnej dopravy Mapové údaje Záloha @@ -609,7 +609,7 @@ Použitie mapy s vysokým rozlíšením pre zariadenia s vysokou hustotou bodov Umiestnenie zatiaľ nenájdené Stiahnuť - Hľadať prepravu + Hľadať hromadnú dopravu Hľadá sa preprava (bez cieľa): Hľadá sa preprava ({0} ako cieľ): nič @@ -701,7 +701,7 @@ Pokračujte rovno Neskôr Stiahnuť oblasti - Ďakujeme, že ste si vybrali OsmAnd. Na použitie hlavných funkcií tejto aplikácie potrebujete nejaké regionálne offline údaje, ktoré si môžete stiahnuť (použite "Nastavenia" → "Mapové súbory"). Potom budete môcť zobrazovať mapy, vyhľadávať adresy, body záujmov (POI) a verejnú dopravu. + Ďakujeme, že ste si vybrali OsmAnd. Na použitie hlavných funkcií tejto aplikácie potrebujete nejaké regionálne offline údaje, ktoré si môžete stiahnuť (použite Nastavenia → Mapové súbory). Potom budete môcť zobrazovať mapy, vyhľadávať adresy, body záujmov (POI) a hromadnú dopravu. Hľadá sa signál… Hľadať v blízkosti poslednej pozície Hľadať neďaleko Vás @@ -715,8 +715,8 @@ Linky Zastávka zastávky - Nasledovná trasa - Prednostná trasa + Nasledovné pokyny + Predošlé pokyny Dokončiť hľadanie Vybrať zastávku na vystúpenie prednostná vzdialenosť @@ -725,7 +725,7 @@ Vzdialenosť trasy Hromadná doprava OK - Zobrazenie zastávok verejnej dopravy na mape + Zobrazenie zastávok hromadnej dopravy na mape Zobraziť zastávky hrom.dopravy Navigačná aplikácia OsmAnd Údaje POI boli úspešne aktualizované ({0} bolo načítaných) @@ -1066,8 +1066,8 @@ OsmAnd je open source navigácia s offline aj online mapami OsmAnd je open source navigácia s offline aj online mapami Výber minimálneho priblíženia na zobrazenie na mape, ak sú dostupné. Môže byť vyžadovaný oddelený SRTM súbor: - " OsmAnd (OSM Automatizované navigačné pokyny) OsmAnd je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Stiahnutie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, dopravné spojenie verejnými dopravnými zastávky, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovania pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy Obmedzenia tejto voľnej verzie OsmAndu: - Počet stiahnutí máp je obmedzený - Žiadny prístup k POI offline Wikipédii OsmAnd je aktívne vyvíjaný a náš projekt a jeho ďalší pokrok závisí od finančných príspevkov na financovanie rozvoja a testovanie nových funkcii. Prosím, zvážte nákup OsmAnd+, alebo financovanie konkrétnych nových funkcií (bidforfix) alebo všeobecný dar. Viac na www.osmand.net. " - " OsmAnd+ (OSM Automatizované navigačné pokyny) OsmAnd+ je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. OsmAnd+ je platená verzia aplikácie. Jej zakúpením podporíte projekt, vývoj nových funkcií a získate najnovšie aktualizácie. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Neobmedzené sťahovanie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, dopravné spojenie verejnými dopravnými zastávky, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovanie pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy " + " OsmAnd (OSM Automatizované navigačné pokyny) OsmAnd je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Stiahnutie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, zastávky hromadnej dopravy, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovania pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy Obmedzenia tejto voľnej verzie OsmAndu: - Počet stiahnutí máp je obmedzený - Žiadny prístup k POI offline Wikipédii OsmAnd je aktívne vyvíjaný a náš projekt a jeho ďalší pokrok závisí od finančných príspevkov na financovanie rozvoja a testovanie nových funkcii. Prosím, zvážte nákup OsmAnd+, alebo financovanie konkrétnych nových funkcií (bidforfix) alebo všeobecný dar. Viac na www.osmand.net. " + " OsmAnd+ (OSM Automatizované navigačné pokyny) OsmAnd+ je open source navigačná aplikácia s prístupom k širokej škále globálnych dát OpenStreetMap (OSM). Všetky mapové podklady (vektorové alebo dlaždice máp) môžu byť uložené na karte pamäti telefónu pre offline použitie. OsmAnd tiež ponúka offline a online smerovacie funkcie, vrátane turn-by-turn hlasových pokynov. OsmAnd+ je platená verzia aplikácie. Jej zakúpením podporíte projekt, vývoj nových funkcií a získate najnovšie aktualizácie. Niektoré z hlavných funkcií: - Kompletné funkcie v režime offline (uloženie stiahnutých vektorových alebo dlaždicových máp v úložisku zariadenia) - Kompaktné offline vektorové mapy pre celý svet - Neobmedzené sťahovanie máp pre krajinu alebo región priamo z aplikácie - Možné prekrytia niekoľkých mapových vrstiev ako GPX alebo navigačná trasa, body záujmu, obľúbené, vrstevnice, zastávky hromadnej dopravy, ďalšie mapy s prispôsobiteľnou priehľadnosťou - Offline vyhľadávanie adries a miest (POI) - Offline smerovanie pre krátke vzdialenosti (experimentálne) - Režimy pre auto, bicykel, a peší režim s: - voliteľným/automatickým denným / nočným režimom - voliteľné približovanie mapy v závislosti na rýchlosti - voliteľné otáčanie mapy podľa kompasu alebo smeru pohybu - voliteľne navádzanie do jazdných pruhov, zobrazenie obmedzenia rýchlosti, nahrané a TTS hlasy " Môžete prepínať, či a ako sa zobrazenie mapy otáča tým, že opakovane kliknete na ikonu kompasu v obrazovke mapy. \n\nMožnosti sú: @@ -1593,8 +1593,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Nastavenia navigácie Nastavenia určovania trasy Kamión - Kopírujem dátové súbory OsmAnd do nového cieľa (%s) - Kopírujem dátové súbory OsmAnd + Kopírujem dátové súbory OsmAnd do nového cieľa (%s)… + Kopírujem dátové súbory OsmAnd… Kopírujem súbor (%s) do nového cieľa… Chcete aby OsmAnd presunul údajové súbory do nového cieľa? Zvoľte \"Nie\" ak chcete, aby OsmAnd len vytvoril a použil nový prázdny priečinok. Vypočítať OsmAnd offline trasu From 0213bc0acdb659c1856e7a6dc372162393b104a0 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 15:27:15 +0100 Subject: [PATCH 096/372] try in setupFavorites --- .../osmand/plus/dashboard/DashFavoritesFragment.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index c2ac591e90..5a2cc1b00e 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -61,8 +61,6 @@ public class DashFavoritesFragment extends DashBaseFragment { return view; } - - @Override public void onResume() { super.onResume(); @@ -76,12 +74,6 @@ public class DashFavoritesFragment extends DashBaseFragment { updateLocation(location); } setupFavorites(); - - //Ckeck if this fixes that lists are empty when returning from the map screen - View view = getView(); - if (view != null) { - view.invalidate(); - } } @@ -152,6 +144,8 @@ public class DashFavoritesFragment extends DashBaseFragment { }); favorites.addView(view); } + //Check if this fixes that lists are empty when returning from the map screen + mainView.invalidate(); } private void updateArrows() { From d32b95407f917add8056b198dc0e77ff0a5245ee Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Thu, 1 Jan 2015 15:23:30 +0100 Subject: [PATCH 097/372] Translated using Weblate (Russian) Currently translated at 93.6% (572 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 36ca52dacb..d666528e2b 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -637,4 +637,5 @@ Поезд (аттракцион) Водные горки + Радар From 2371a0887c729afe0e6876a021c4cd1cb0fd597d Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 1 Jan 2015 15:35:25 +0100 Subject: [PATCH 098/372] Translated using Weblate (Danish) Currently translated at 100.0% (611 of 611 strings) --- OsmAnd/res/values-da/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml index 7124334669..40aa813985 100644 --- a/OsmAnd/res/values-da/phrases.xml +++ b/OsmAnd/res/values-da/phrases.xml @@ -661,4 +661,6 @@ Tårn Akvarie + Mast + Radar From 89fb7976a321bad60a73be111a4e545f1281a4e3 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 1 Jan 2015 15:44:03 +0100 Subject: [PATCH 099/372] remove not-working fix --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 5a2cc1b00e..eaab2b78c3 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -144,8 +144,6 @@ public class DashFavoritesFragment extends DashBaseFragment { }); favorites.addView(view); } - //Check if this fixes that lists are empty when returning from the map screen - mainView.invalidate(); } private void updateArrows() { From f1b7df965e22e4ab3e47e459ab2204fc5d4591b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Fri, 2 Jan 2015 01:37:45 +0100 Subject: [PATCH 100/372] Translated using Weblate (Korean) Currently translated at 100.0% (611 of 611 strings) --- OsmAnd/res/values-ko/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml index 274f70a114..ba4fd43390 100644 --- a/OsmAnd/res/values-ko/phrases.xml +++ b/OsmAnd/res/values-ko/phrases.xml @@ -643,4 +643,6 @@ 타워 아쿠아리움 + 돛대 + 레이더 From 42181fff4ed117a775d24dcbe82d16ad4077d869 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 1 Jan 2015 16:35:22 +0100 Subject: [PATCH 101/372] Translated using Weblate (Danish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-da/strings.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index c2578af4ca..e41a66f79c 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -179,7 +179,7 @@ Opdatering af offlinekort Opret interessepunkt-filter Transportform: - Vælg transportmetode + Vælg transportform Solopgang: %1$s \nSolnedgang: %2$s @@ -345,7 +345,7 @@ Position endnu ikke kendt Ændre gennemsigtighed (0 - gennemsigtig, 255 - ugennemsigtig) Afbryd hentning af fil? - Til mange af funktionerne i programmet skal der bruges nogle regionale offline data som kan hentes via \'Indstillinger\' → \'Administrer kortfiler\'. Bagefter kan man se kort, søge adresser, finde interessepunkter (IP) og finde offentligtrafik. + Til mange af funktionerne i programmet skal der bruges nogle regionale offline data som kan hentes via \'Indstillinger\' → \'Administrer kortfiler\'. Bagefter kan man se kort, søge adresser, finde interessepunkter (IP) og finde kolllektivtrafik. Basiskort er nødvendige for korrekt programfunktion og blev automatisk valgt. Fandt intet. Hvis man ikke kan finde sin region kan man lave den selv (se http://osmand.net). Online- og delkort @@ -898,7 +898,7 @@ GPX-spor… Fejl under læsning af GPX-data Offline vektorkort - Søg transport ved stoppested + Søg efter transport ved stoppested Placering: \n Lat %1$.5f \n Long %2$.5f @@ -1057,7 +1057,7 @@ Åbningstider format understøtter ikke redigering Vælg stoppestedet for afstigning stoppesteder der skal passeres - Vis stoppesteder for kollektivtrfikt på kortet + Vis stoppesteder for kollektivtrafik på kortet Vis stoppesteder Navigationsprogram OsmAnd Interessepunkt-data blev opdateret ({0} blev indlæst) @@ -1087,9 +1087,8 @@ "Kortkilden og lag der vises kan ændres via \'Menu\' → \'Konfigurer kort\'. \n\nUnder \'Kortkilde...\' vælges de forhåndsindlæste vektorkort, forhåndsdefinerede (online) delkortkilder (aktiver \'Online og delkort\' udvidelsen) eller kort der er manuelt oprettet f.eks. ved hjælp af OsmAndMapCreator på en PC. \n\nOsmAnd understøtter også brugerdefinerede kilder. " - OsmAnd understøtter forskellige profiler (kan konfigureres) til forskellige brugstilfælde. -\n\nSkift profil via profilknappen i nederste venstre hjørne af skærmen (bil, cykel eller fodgænger) eller når en rute oprettes (\'Transportform\'). - + "OsmAnd understøtter forskellige profiler (kan konfigureres) til forskellige brugstilfælde. +\n\nSkift profil via profilknappen i nederste venstre hjørne af skærmen (bil, cykel eller fodgænger) eller når en rute oprettes (\'transportform\'). " "Søg efter steder direkte på kortet via \'Brug placeringer\' → \'Søg i nærheden , eller ved at bruge søgeskærmen via \'Menu\' → \'Søg\'. \n\nSøgeskærmen indeholder skabeloner for søgning \n * efter adresse From db06b6f225724a86191bc799b0aa250296bad670 Mon Sep 17 00:00:00 2001 From: Nicolas Palix Date: Thu, 1 Jan 2015 19:33:30 +0100 Subject: [PATCH 102/372] Translated using Weblate (French) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-fr/strings.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 18a464cbe3..4cc3021a23 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -200,7 +200,7 @@ Données PI Données adresses - Données des transports + Données des transports publics Cartes Désactivé @@ -421,11 +421,11 @@ Utilisez des cartes de haute résolution pour les appareils les mieux équipés Position inconnue Télécharger - Chercher transport + Chercher un transport public Arrêts à proximité (aucune destination définie) : Arrêts à proximité ({0} de la destination) : aucun - Réinitialiser la recherche + Réinitialiser la recherche de transport Carte Voix enregistrée Aucune carte vectorielle n\'a été chargée @@ -434,7 +434,7 @@ Trace GPX… Erreur de lecteur des données GPX Cartes vectorielles OSM - Chercher transport à l\'arrivée + Chercher un transport à l\'arrivée Position :\n Lat. %1$.5f\n Lon. %2$.5f Bogue Modifier PI @@ -456,13 +456,13 @@ Aucune région trouvée sur la carte SD. Essayez d\'en télécharger une d\'internet. Paramètres de recherche pour trouver le PI Tout - Routes de transport + Itinéraires de transports publics Merci à Yandex de fournir des informations sur le trafic. Trafic Yandex Route Favoris Bogues OSM - Arrêts de transport + Arrêts de transports publics Points d\'intérêt… Source de la carte… Couches @@ -513,7 +513,7 @@ Avancez Continuer Téléchargement des régions - Merci d\'avoir choisi OsmAnd. La plupart des fonctionnalités de l\'application nécessitent des données régionales, utilisables hors-ligne, que vous pouvez au préalable télécharger (\'Paramètres\' → \'Données hors-ligne\') ou préparer vous-même. Ces données permettront de visualiser les cartes et de rechercher une adresse, un point d\'intérêt (PI) ou un transport en commun. + Merci d\'avoir choisi OsmAnd. La plupart des fonctionnalités de l\'application nécessitent des données régionales, utilisables hors-ligne, que vous pouvez au préalable télécharger (\'Paramètres\' → \'Données hors-ligne\') ou préparer vous-même. Ces données permettront de visualiser les cartes et de rechercher une adresse, un point d\'intérêt (PI) ou un transport public. Recherche d\'un signal… Rechercher près de la dernière position Rechercher à proximité @@ -537,8 +537,8 @@ Distance du trajet : Transport OK - Afficher les arrêts de transport en commun sur la carte - Afficher les arrêts de transport public + Afficher les arrêts de transport publics sur la carte + Afficher les arrêts de transports publics Application de navigation OsmAnd Mise à jour des données PI réussie ({0} ont été chargés) Erreur de mise à jour des index locaux @@ -877,7 +877,7 @@ Recherche de points d\'intérêt (PI) Recherche par adresse Coordonnées - Recherche de transports en commun + Recherche de transports publics Recherche parmi les favoris Historique des recherches Rond-point : prenez la %1$d sortie puis continuez @@ -1025,8 +1025,8 @@ \n* Nombreuses corrections de bugs " Coller à la route pendant la navigation Coller à la route -" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes hors-lignes compactes disponibles pour le monde entier - Téléchargement des cartes pour un pays ou une région directement depuis l\'application - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt (PI), des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) Limitations de la version gratuite de OsmAnd : - Nombre de téléchargement de cartes limité - Pas d\'accès aux PI Wikipédia hors-ligne. OsmAnd est activement développé et notre projet et ses progrès futurs dépendent des contributions financières pour financer le développement et le test de nouvelles fonctionnalités. Veuillez considérer l\'achat d\'OsmAnd+, le financement d\'une fonctionnalité spécifique, ou un donation sur osmand.net. " -" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. OsmAnd+ est la version payante de l\'application, en l\'achetant vous supportez le projet, financez le développement de nouvelles fonctionnalités, et recevez les dernières mises à jour. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes es compactes disponibles pour le monde entier - Téléchargement illimité des cartes pour un pays ou une région directement depuis l\'application - Points d\'intérêt (PI) Wikipédia hors-ligne, parfait pour le tourisme - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt, des favoris, des courbes de niveau, les arrêts de transport en commun, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) - Affichage des limitations de vitesse, voix enregistrées et voix de synthèse " +" OsmAnd (OSM Automated Navigation Directions) OsmAnd est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes hors-lignes compactes disponibles pour le monde entier - Téléchargement des cartes pour un pays ou une région directement depuis l\'application - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt (PI), des favoris, des courbes de niveau, les arrêts de transport public, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) Limitations de la version gratuite de OsmAnd : - Nombre de téléchargement de cartes limité - Pas d\'accès aux PI Wikipédia hors-ligne. OsmAnd est activement développé et notre projet et ses progrès futurs dépendent des contributions financières pour financer le développement et le test de nouvelles fonctionnalités. Veuillez considérer l\'achat d\'OsmAnd+, le financement d\'une fonctionnalité spécifique, ou un donation sur osmand.net. " +" OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ est un logiciel libre de navigation exploitant une grande variété de données issues OpenStreetMap (OSM). Toutes les données (cartes vectorielles ou à base de tuiles) peuvent être stockées dans la mémoire du téléphone pour un usage hors-ligne. OsmAnd permet également le routage en ligne et hors-ligne avec des instructions vocales pas à pas. OsmAnd+ est la version payante de l\'application, en l\'achetant vous supportez le projet, financez le développement de nouvelles fonctionnalités, et recevez les dernières mises à jour. Fonctionnalités principales : - Fonctionne complètement hors-ligne (stockage des cartes téléchargées au format vectoriel ou tuile dans le périphérique de stockage) - Cartes es compactes disponibles pour le monde entier - Téléchargement illimité des cartes pour un pays ou une région directement depuis l\'application - Points d\'intérêt (PI) Wikipédia hors-ligne, parfait pour le tourisme - Possibilité de superposer plusieurs couches, telles que des traces GPX ou de navigation, des points d\'intérêt, des favoris, des courbes de niveau, les arrêts de transport public, et bien d\'autres cartes avec une transparence personnalisable - Recherche hors-ligne d\'adresses et de lieux (PI) - Navigation hors-ligne pour de courtes distances (expérimentale) - Mode voiture, vélo et piéton avec : - Option de vue jour/nuit automatique - Option de zoom automatique lors des déplacements - Orientation automatique de la carte (fixe, boussole, cap) - Affichage des limitations de vitesse, voix enregistrées et voix de synthèse " "La source des cartes et des couches affichées est modifiable via \'Menu\' → \'Affichage de la carte\' → \'Source de la carte…\'. \n\tVous pouvez choisir entre les cartes vectorielles hors-ligne préchargées (choix par défaut, nécessaires pour la navigation hors-ligne), ou des sources prédéfinies de tuiles de carte en ligne ou en cache (activer le greffon \'Cartes en ligne\' pour cela), ou des cartes créées manuellement sur un PC grâce à OsmAndMapCreator. \n\tOsmAnd supporte également des sources personnalisées. " @@ -1053,7 +1053,7 @@ Mode avancé… Parking Urgences - Transports en commun + Transports publics Divertissements Restauration Tourisme @@ -1468,8 +1468,8 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et \n Note 1 : Les anciens fichiers seront conservés (mais vous pouvez les supprimer manuellement)\n Note 2 : En raison de ce nouveau dossier de stockage, il ne sera plus possible de partager des fichiers entre OsmAnd et OsmAnd+. Souhaitez-vous qu\'OsmAnd copie aussi ses données vers la nouvelle destination ? (choisissez \'Non\' pour qu\'OsmAnd crée et utilise un nouveau dossier vierge) Copie du fichier (%s) vers le nouvel emplacement… - Copie des fichiers de données OsmAnd vers la nouvelle destination (%s) - Copie des fichiers de données OsmAnd + Copie des fichiers de données OsmAnd vers la nouvelle destination (%s)… + Copie des fichiers de données OsmAnd… Calcul de la route OsmAnd hors-ligne Camion Privilégier les autoroutes From 7c3736d469e7602e2f9f6f2c611a5c3d3ea7d2c1 Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Thu, 1 Jan 2015 21:15:56 +0100 Subject: [PATCH 103/372] Translated using Weblate (Greek) Currently translated at 93.5% (1491 of 1594 strings) --- OsmAnd/res/values-el/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 0821bb8b27..d013ae755e 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -3,7 +3,7 @@ Λειτουργία για προχωρημένους… Στάθμευση Επείγοντα - Δημόσιες Μεταφορές + Δημόσιες μεταφορές Διασκέδαση Διαμονή Εστιατόρια @@ -509,7 +509,7 @@ Δεδομένα ΣΕ Δεδομένα διευθύνσεων - Δεδομένα μεταφορών + Δεδομένα δημόσιων μεταφορών Δεδομένα χάρτη Απενεργοποιημένο Δεδομένα Φωνής (TTS) @@ -1529,8 +1529,8 @@ Όριο βάρους Καθορίσετε το βάρος του οχήματος που θα είναι επιτρεπτό στις διαδρομές Αντιγραφή αρχείου (%s) στο νέο προορισμό… - Αντιγραφή αρχείων δεδομένων OsmAnd στο νέο προορισμό (%s) - Αντιγραφή αρχείων δεδομένων OsmAnd + Αντιγραφή αρχείων δεδομένων OsmAnd στο νέο προορισμό (%s)… + Αντιγραφή αρχείων δεδομένων OsmAnd… Φορτηγό Προτιμήσεις πλοήγησης Προτιμήσεις δρομολόγησης From d47f0bdc3213141296a07b11b0d946d3c4b85272 Mon Sep 17 00:00:00 2001 From: 8c6311e901274f6baef2068792c8ab Date: Thu, 1 Jan 2015 18:51:59 +0100 Subject: [PATCH 104/372] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?= =?UTF-8?q?an=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 71.2% (1135 of 1594 strings) --- OsmAnd/res/values-nb/strings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 100dc45eca..36e8fdaf6a 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -101,7 +101,7 @@ Interessepunktsøk Adressesøk Koordinater - Transportsøk + Kollektivtrafikksøk Favorittsøk Søkehistorikk OsmAnd offline navigering er midlertidig ikke tilgjengelig. @@ -268,7 +268,7 @@ Fast Gjeldende posisjon… Siste kartvisning - Søk nær: + Utgangspunkt: Søk nær her Lagre rute som GPX-spor Rute vellykket lagret som \'%1$s\'. @@ -297,7 +297,7 @@ Interessepunkt-data Adressedata - Transportdata + Kollektivtrafikkdata Kartdata Deaktivert Taledata (TTS) @@ -415,7 +415,7 @@ Velg utseende på opptegningen Nettsted Telefon - Søk transport + Søk offentlig transport Transportresultater (ingen mål): Transportresultater ({0} til mål): ingen @@ -472,7 +472,7 @@ Portrett, landskap eller enhet Legg til ny regel Ruter - Rutedistanse + Reiserutedistanse Transport OK Vis stoppesteder for offentlig transport på kart @@ -858,7 +858,7 @@ Avstand Turer Alle - Mer... + Mer… Se gjennom kart Fargekod bygninger etter type Bygninger på zoom 15 @@ -892,7 +892,7 @@ Unngå motorveier Vektgrense Angi kjøretøyets vekt som er tillatt på ruter - Kopierer OsmAnd-datafiler til nytt sted (%s) + Kopierer OsmAnd-datafiler til det nye stedet (%s)… Slett alle punkter Bruk Kalmanfilter for å unngå kompassavvik Bruk Kalmanfilter @@ -983,7 +983,7 @@ Forenklet kinesisk Tradisjonell kinesisk Legg til som målpunkt - Velg GPX … + Velg GPX… Velg på kart… Favoritt… Ruteinnstillinger @@ -1109,7 +1109,7 @@ Fravelg Velg for å vise Lagre som gruppe av favoritter - Laster %1$s … + Laster %1$s… "Avstand: %1$s (%2$s punkter) " "Starttid: %1$tF, %1$tT " "Sluttid: %1$tF, %1$tT " @@ -1126,8 +1126,8 @@ timer siden minutter siden sekunder siden - Kopierer fil (%s) til det nye stedet... - Kopierer OsmAnd-datafiler + Kopierer fil (%s) til det nye stedet… + Kopierer OsmAnd-datafiler… Reisemål GPX-filnavn Distansekalkulator & Planleggingsverktøy From ff51b242091d5fe3e59f92358ad253c58ce3fd88 Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Thu, 1 Jan 2015 16:01:54 +0100 Subject: [PATCH 105/372] Translated using Weblate (Polish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-pl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 871c348d33..334bc3b8ae 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1949,7 +1949,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Użyj bezpiecznego połączenia z serwerem Użyj HTTPS Zaawansowane - Strona startowa + Dom Dostępne aktualizacje dla %1$s map Wyszukaj POKAŻ MAPĘ From 72317659b99c690bedc3a9d8df955c74daa28ba5 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Thu, 1 Jan 2015 19:19:19 +0100 Subject: [PATCH 106/372] Translated using Weblate (Sardinian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-sc/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 958223bcde..9b7aabb130 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -83,8 +83,8 @@ \n Nota 2: in sa cartella noa non at a èssere possìbile cumpartzire sos datos intra OsmAnd e OsmAnd+. Boles chi OsmAnd còpiet sos datos suos fintzas in sa destinatzione noa? Icherta \"Nono\" pro fàghere petzi creare ed impreare una cartella noa a OsmAnd. Copiande su documentu (%s) in sa destinatzione noa… - Copiande sos datos de OsmAnd in (%s), sa destinatzione noa - Copiande sos datos de OsmAnd + Copiande sos datos de OsmAnd in (%s), sa destinatzione noa… + Copiande sos datos de OsmAnd… Càlcula s\'àndala OsmAnd sena lìnia Càmion Preferèntzias de nàvigu @@ -1146,7 +1146,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres In su server bi sunt documentos de mapas non compatìbiles cun sa versione atuale de su programma. Pro los iscarrigare e impreare agiorna s\'aplicu a s\'ùritma versione. Torra a numenare Non dessinidu - + Positzione currente… Ùrtima bisura mapa Imbia ad OSM @@ -1175,7 +1175,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Torra a carrigare dae s\'ischeda SD Iscàrriga Datos indiritzos - Datos trasportos + Datos trasportos pùblicos Datos mapa Deativadu Boghes (TTS) @@ -1357,7 +1357,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Errore durante su carrigamentu de su documentu GPX Imbia resumu Totus - Àndala de trsportu pùblicu + Àndala de trasportu pùblicu Gràtzias a Yandex pro sas informatziones pro su tràficu. Yandex (tràficu) Àndala From e01d927bb2c05ffb56eff54d86c007abbf40276b Mon Sep 17 00:00:00 2001 From: Damjan Gerl Date: Fri, 2 Jan 2015 01:12:45 +0100 Subject: [PATCH 107/372] Translated using Weblate (Slovenian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-sl/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 86f15a8079..7b81b9a726 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -880,7 +880,7 @@ tipkajte za filtriranje Zaslon z visoko ločljivostjo Ne raztegni (in zamegli) ploščic zemljevida na zaslonih z visoko gostoto - Iskanje prevoza + Iskanje javnega prevoza Rezultati prevoza (brez cilja): Rezultati prevoza ({0} do cilja): brez @@ -898,8 +898,8 @@ Podrobnosti poti Priljubljene točke so bile uspešno uvožene Datoteke GPX, ki vsebuje priljubljene, ni bilo mogoče najti na {0} - " OsmAnd (OSM Automated Navigation Directions) OsmAnd je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: * nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom * nastavljivo povečavo zemljevida glede na hitrost gibanja * nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja * nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS). Brezplačna različica programa OsmAnd ima naslednje omejitve: - omejeno je število prenosov zemljevidov - brez povezave ni dostopa do točk iz Wikipedije. OsmAnd je v aktivnem razvoju. Napredek projekta je odvisen od finančnih prispevkov s katerimi se financira razvoj in testiranje novih funkcionalnosti. Prosimo, razmislite o nakupu aplikacije OsmAnd+, ali financiranju posamezne funkcionalnosti, ali nenamensko donacijo na spletni strani osmand.net. " - " OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd+ omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). OsmAnd+ je plačljiva različica aplikacije. Z nakupom financirate nadaljnji razvoj in testiranje novih funkcionalnosti ter pridobite zadnje posodobitve. Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Neomejen prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Wikipedia brez povezave (prenos točk iz Wikipedie), odlično za oglede znamenitosti - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: * nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom * nastavljivo povečavo zemljevida glede na hitrost gibanja * nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja * nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS) " + " OsmAnd (OSM Automated Navigation Directions) OsmAnd je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: - nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom - nastavljivo povečavo zemljevida glede na hitrost gibanja - nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja - nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS). Brezplačna različica programa OsmAnd ima naslednje omejitve: - omejeno je število prenosov zemljevidov - brez povezave ni dostopa do točk iz Wikipedije. OsmAnd je v aktivnem razvoju. Napredek projekta je odvisen od finančnih prispevkov s katerimi se financira razvoj in testiranje novih funkcionalnosti. Prosimo, razmislite o nakupu aplikacije OsmAnd+, ali financiranju posamezne funkcionalnosti, ali nenamensko donacijo na spletni strani osmand.net. " + " OsmAnd+ (OSM Automated Navigation Directions) OsmAnd+ je odprtokodna aplikacija za navigacijo, ki uporablja širok nabor zemljevidov OpenStreetMap (OSM) za cel svet. Vse podatke zemljevidov (vektorske in ploščice) lahko shranite v pomnilnik naprave (telefona ali tablice) za uporabo brez povezave. OsmAnd+ omogoča tudi izračun poti in glasovno vodenje od zavoja do zavoja (turn-by-turn). OsmAnd+ je plačljiva različica aplikacije. Z nakupom financirate nadaljnji razvoj in testiranje novih funkcionalnosti ter pridobite zadnje posodobitve. Pomembnejše lastnosti: - Popolnoma uporaben brez povezave (shrani prenesene vektorske podatke ali ploščice zemljevida v shrambo naprave) - Na voljo so stisnjeni vektorski podatki zemljevida za cel svet - Neomejen prenos podatkov zemljevida posameznih držav ali področij znotraj aplikacije - Wikipedia brez povezave (prenos točk iz Wikipedie), odlično za oglede znamenitosti - Prekrivanje več plasti zemljevidov, npr. sled GPX, načrt poti, zanimive in priljubljene točke, izohipse, postajališča javnega prometa, dodatni zemljevidi z nastavljivo prosojnostjo - Iskanje naslovov in krajev (POI) brez povezave do interneta - Izdelava načrta najkrajše poti (poskusno) - Način za avtomobiliste, kolesarje in pešce z: - nastavljivim samodejnim preklopom med dnevnim in nočnim prikazom - nastavljivo povečavo zemljevida glede na hitrost gibanja - nastavljivo usmerjenostjo zemljevida glede na kompas ali glede na smer gibanja - nastavljivo vodenje po voznih pasovih, prikaz omejitev hitrosti, vodenje s posnetim ali sintetiziranim govorom (TTS) " Napaka pri nalaganju GPX-a Pošlji poročilo Na SD kartici ni podatkov območij za uporabo brez povezave. Prenesite želena območja iz interneta. @@ -912,7 +912,7 @@ Pot Priljubljeni OSM hrošči - Postaje javnega prevoza + Postaje prevoza POI … Vir zemljevida … Iskanje POI @@ -1618,8 +1618,8 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A \n Opomba 2: v novem mestu shrambe si aplikaciji OsmAnd and OsmAnd+ ne bosta mogli deliti podatkov. OsmAnd lahko poskusi premakniti podatke na novo mesto hrambe. Ali si želite tega? Izberite \'Ne\' če želite, da OsmAnd ustvari in uporablja novo mapo. Kopiranje datoteke (%s) na novo mesto hrambe … - Kopiranje datotek s podatki za OsmAnd na novo mesto hrambe (%s) - Kopiranje datotek s podatki programa OsmAnd + Kopiranje datotek s podatki za OsmAnd na novo mesto hrambe (%s) … + Kopiranje datotek s podatki programa OsmAnd … Prikaz položaja vedno v središču Naslovi za celotno državo Maratščina From ff7d743297164d9c47d36f300c612b6a634745ae Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Thu, 1 Jan 2015 19:27:28 +0100 Subject: [PATCH 108/372] Translated using Weblate (French) Currently translated at 100.0% (611 of 611 strings) --- OsmAnd/res/values-fr/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml index 6537081065..f05caa5dab 100644 --- a/OsmAnd/res/values-fr/phrases.xml +++ b/OsmAnd/res/values-fr/phrases.xml @@ -631,4 +631,8 @@ Couvreur de moquettes Couvreur de parquets Selle + Tour + Mât + Radar + Aquarium From 028d7b6d31426b20287e1ae9435af39b34db0bce Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 16:47:25 +0100 Subject: [PATCH 109/372] see if this fixes direction arrows only appearing after position fix --- OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index c888428038..6cb955a40c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -686,6 +686,9 @@ public class MapActivityActions implements DialogProvider { @Override public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getMainMenuActivity()); + LatLon loc = mapActivity.getMapLocation(); + newIntent.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude()); + newIntent.putExtra(SearchActivity.SEARCH_LON, loc.getLongitude()); newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); mapActivity.startActivity(newIntent); return true; From 6deb6aa9212c527893a82a8cfe3225bd0341da51 Mon Sep 17 00:00:00 2001 From: elPresidento Date: Fri, 2 Jan 2015 08:13:38 +0100 Subject: [PATCH 110/372] Translated using Weblate (Czech) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-cs/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index bd8612a612..c5d1a15325 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -515,7 +515,7 @@ Na SD kartě nejsou žádná offline data pro oblasti. Zkuste nějaké stáhnout z internetu. Zadejte dotaz na POI Jakýkoli - Dopravní komunikace + Trasa hromadné dopravy Děkujeme Yandexu za dopravní informace. Yandex doprava Cesta @@ -584,14 +584,14 @@ Cesty Zastávka zastávky - Hledat spojení dál - Hledat spojení před + Následné pokyny + Předchozí pokyny Ukončit hledání Vyberte zastávku kde vystoupíte pěší vzdálenost poté pěší vzdálenost před počet zastávek - Délka cesty + Vzdálenost trasy Doprava OK Zobrazit v mapě zastávky veřejné dopravy From 06669b1dceae40675ad21d9ed965c406e7563eb6 Mon Sep 17 00:00:00 2001 From: Damjan Gerl Date: Fri, 2 Jan 2015 01:40:59 +0100 Subject: [PATCH 111/372] Translated using Weblate (Slovenian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-sl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 7b81b9a726..ded65228c6 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -954,13 +954,13 @@ Poti Postaja postaje - Naslednja pot + Naknadna pot Prejšnja pot Izberite izstopno postajo prejšnja razdalja naslednja razdalja postaje do izstopa - razdalja poti + Razdalja poti V redu Prikaz postaj javnega prevoza na zemljevidu Prikaz postaj prevoza From bb380ddd1e203cc6abeb58aa9808323ca7c37d06 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Fri, 2 Jan 2015 02:10:44 +0100 Subject: [PATCH 112/372] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 31 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 70847bf4d5..5ccbd53602 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -32,7 +32,7 @@ 進階模式… 停車場 緊急救助 - 大眾運輸 + 公共交通 娛樂 住宿 餐廳 @@ -63,8 +63,8 @@ \n\t* 登錄為\'藍色\'，表示伺服器有更新的版本 \n\t* 登錄為斜體字，表示未在裝置上使用 " 建立興趣點篩選 - 運輸模式： - 選擇運輸模式 + 交通模式： + 選擇交通模式 日出：%1$s \n日落：%2$s 日/夜資訊 @@ -175,7 +175,7 @@ POI(興趣點)查尋 地址查尋 座標查尋 - 大眾運輸查尋 + 公共交通查尋 我的最愛查尋 歷史記錄查尋 OsmAnd 離線導航，暫時不能使用。 @@ -186,7 +186,7 @@ 未知地理位置 調整透明度(0 - 透明, 255 - 不透明) 您要中斷下載中的檔案嗎？ - 感謝您使用 OsmAnd。對於此應用程式的許多功能，您需要一些地區的離線資料，您可以透過\'設定\' -> \'管理地圖檔案\'來下載。之後您可瀏覽地圖、位置的地址、查看興趣點以及尋找大眾運輸。 + 感謝您使用 OsmAnd。對於此應用程式的許多功能，您需要一些地區的離線資料，您可以透過\'設定\' -> \'管理地圖檔案\'來下載。之後您可瀏覽地圖、位置的地址、查看興趣點以及尋找公共交通。 底圖為某些特別的應用功能必需使用的，並且預設為下載。 找不到任何資料。如果您不能在您的區域找到，您可以自行製作(參考http://osmand.net)。 線上地圖圖磚 @@ -457,7 +457,7 @@ 興趣點資料 地址資料 - 大眾運輸資料 + 公共交通資料 地圖資料 已停用 語音資料(TTS) @@ -526,9 +526,8 @@ \n\n在\'地圖來源…\'之下，您可以選擇使用預先載入的離線向量圖（預設，離線導航所需），或預先定義（連線或離線快取）圖磚來源（在此啟動\'線上地圖\'外掛元件下的\'設定\' → \'外掛元件\'），或手動建立地圖，例如在 PC 上使用的 OsmAndMapCreator。 \n\nOsmAnd 也支援自訂來源。 " 使用設定檔 - OsmAnd 在不同的使用情況下，支援不同的使用者設定檔 (可自行訂製) 。 - \n\n您可透過地圖畫面左下角的設定檔按鈕(汽車、自行車、步行三種圖示)更改使用設定檔 ，或是作路線規劃。 - + "OsmAnd 在不同的使用情況下，支援不同的使用者設定檔 (可自行訂製) 。 +\n\n您可透過地圖畫面左下角的設定檔按鈕(汽車、自行車、步行三種圖示)更改使用設定檔 ，或是作路線規劃(\'交通模式\')。 " 導航 "需要導引到一個地點，可以直接在地圖上選擇並長按該地點，(然後再點選快顯功能表單的\'導引到\')，或著選擇\'導引\'後，在查尋結果清單或是我的最愛清單點選進入。 \n\n目的地標點以一目標旗標記在地圖上，同時 OsmAnd 會顯示達到目的地的距離與它的方位(橙色三角形)。 @@ -658,11 +657,11 @@ 高解析顯示 不要伸展（模糊）在高解析螢幕上的地圖圖磚 下載 - 查尋大眾運輸 + 查尋公共交通 交通運輸結果(無目的地)： 交通運輸結果(有{0}到目的地)： 無 - 重置交通運輸查尋 + 重置公車查尋 地圖 真人語音 向量地圖未載入 @@ -671,7 +670,7 @@ GPX 軌跡… 讀取 GPX 資料錯誤 離線向量地圖 - 查尋交通運輸車站 + 查尋公車站牌 位置：\n 緯度 %1$.5f\n 經度 %2$.5f 程式臭蟲 修改興趣點 @@ -693,13 +692,13 @@ 在 SD 卡上沒有該地區離線資料。由網路下載資料。 輸入查尋條件以查尋興趣點 任何 - 交通運輸路線 + 公車路線 感謝 Yandex 提供的交通資訊。 Yandex 的交通資訊 導航路線 我的最愛 OSM 錯誤(線上) - 候車亭 + 公車站牌 興趣點… 地圖來源… 地圖圖層 @@ -1805,7 +1804,7 @@ 匿名使用者 已登入於 %1$s 詳細資訊 - 運輸 + 交通工具 其它地圖屬性 剩餘元件 狀態列 @@ -1851,7 +1850,7 @@ 東距 地區 地圖上的語言 - 候車亭 + 公車站牌 提示語音 您想要下載離線地圖嗎？ 您已下載了 %1$s 的地圖 From 0b7ac545283372ae8ff9c38f88684ed163872a25 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Fri, 2 Jan 2015 16:43:07 +0100 Subject: [PATCH 113/372] Translated using Weblate (Catalan) Currently translated at 23.7% (145 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index b9cd1de3fc..ca3eaccaff 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -118,4 +118,39 @@ Roba infantil Pelleteria Botiga de teixits + Parada de transport públic + Estació d\'autobús (obsolet) + Estació de tren (obsolet) + Andana de tren (obsolet) + Parada de tren (obsolet) + Entrada de metro + Estació de metro + Parada de taxis + + Aeroport + Heliport + Pista d\'aterratge + Terminal d\'aeroport + Far + + Lloguer de bicicletes + Aparcament per bicicletes + + Complements per la llar + Papereria + Botiga de vaixelles + Botiga de joguines + Materials de construcció + Botiga de descompte + Videoclub + Botiga de persianes + Terminal de ferri + Telefèric + Estació de remuntador + Telecabina + Telecadira + Teleesquí + Túnel + Pont + From f1640a746fa22dc0d1321d1c9479073de0555c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Fri, 2 Jan 2015 01:41:02 +0100 Subject: [PATCH 114/372] Translated using Weblate (Korean) Currently translated at 100.0% (611 of 611 strings) --- OsmAnd/res/values-ko/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ko/phrases.xml b/OsmAnd/res/values-ko/phrases.xml index ba4fd43390..262475f372 100644 --- a/OsmAnd/res/values-ko/phrases.xml +++ b/OsmAnd/res/values-ko/phrases.xml @@ -174,7 +174,7 @@ 다리 속도 경고 카메라 - 터 닝 서클 + 터닝 서클 고속도로 분기점 보트야드 From d5899533f8028198618a881459f2004602567066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Fri, 2 Jan 2015 16:46:36 +0100 Subject: [PATCH 115/372] Translated using Weblate (Polish) Currently translated at 33.3% (204 of 611 strings) --- OsmAnd/res/values-pl/phrases.xml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index ae83426d29..0734fa5994 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -176,7 +176,7 @@ Most Fotoradar - Pogotowie + Ambulatoryjne świadczenia zdrowotne Dworzec kolejowy (nieaktualne) Miejsce do zawracania @@ -198,4 +198,26 @@ Telefon Kosz na śmieci + Zabytkowa kopalnia + Żeglugowy punkt zwrotny + Grobla + Elektrownia + Generator prądu + + Wieża komunikacyjna + Centrala telefoniczna + + Składowisko odpadów + Złomowisko + Molo + Centrum nadzoru + Obserwatorium + Obserwatorium astronomiczne + Wieża + Maszt + Radar + Budowa + Fabryka + Szyb + Sztolnia From aae9d5b08d5b4b4aa996419c3e4cf7a83cdd8c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Fri, 2 Jan 2015 16:48:05 +0100 Subject: [PATCH 116/372] Translated using Weblate (Polish) Currently translated at 33.5% (205 of 611 strings) --- OsmAnd/res/values-pl/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index 0734fa5994..6754d27426 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -220,4 +220,5 @@ Fabryka Szyb Sztolnia + Szyb ropy naftowej From 649570aad42cd41ff8f794eb9ad1eb43a4c0d6cc Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 17:15:16 +0100 Subject: [PATCH 117/372] Fix DashFavoritesList arrows only shown after GPS fix --- OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java | 3 --- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 6cb955a40c..c888428038 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -686,9 +686,6 @@ public class MapActivityActions implements DialogProvider { @Override public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getMainMenuActivity()); - LatLon loc = mapActivity.getMapLocation(); - newIntent.putExtra(SearchActivity.SEARCH_LAT, loc.getLatitude()); - newIntent.putExtra(SearchActivity.SEARCH_LON, loc.getLongitude()); newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); mapActivity.startActivity(newIntent); return true; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index eaab2b78c3..9b881a8b09 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -71,6 +71,10 @@ public class DashFavoritesFragment extends DashBaseFragment { } else { location = getLocationProvider().getLastKnownLocation(); } + //Use map center as origin if no position known + if (location == null) { + location = getMyApplication().getSettings().isLastKnownMapLocation(); + } updateLocation(location); } setupFavorites(); From 2f92bf7c83a8671599a9c24b8685df9be1b45be3 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Fri, 2 Jan 2015 16:49:02 +0100 Subject: [PATCH 118/372] Translated using Weblate (Catalan) Currently translated at 23.8% (146 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index ca3eaccaff..530bcaaf01 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -153,4 +153,5 @@ Túnel Pont + Aspiradores i aparells de neteja From 4c24d74664bbc52e402c9740ca34f82585de1af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Fri, 2 Jan 2015 16:48:51 +0100 Subject: [PATCH 119/372] Translated using Weblate (Polish) Currently translated at 33.7% (206 of 611 strings) --- OsmAnd/res/values-pl/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index 6754d27426..0da7123d67 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -221,4 +221,5 @@ Szyb Sztolnia Szyb ropy naftowej + Wiatrak From e37ae4515619754cf74feb3d2ca5a8e3f7260a7a Mon Sep 17 00:00:00 2001 From: User99gmxat Date: Fri, 2 Jan 2015 17:19:18 +0100 Subject: [PATCH 120/372] Update phrases.xml --- OsmAnd/res/values-de/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index a85ec5e951..5feadca1f5 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -607,4 +607,8 @@ Schaukel-Karussell Eisenbahn (Attraktion) Wasserrutsche + Sendeturm + Mast + Radar + Aquarium From 9602d1d807697a2a224e4a38e2837fce64ccf4c8 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 17:22:03 +0100 Subject: [PATCH 121/372] fix build --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 9b881a8b09..4235adc70f 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -73,7 +73,7 @@ public class DashFavoritesFragment extends DashBaseFragment { } //Use map center as origin if no position known if (location == null) { - location = getMyApplication().getSettings().isLastKnownMapLocation(); + location = getMyApplication().getSettings().getLastKnownMapLocation(); } updateLocation(location); } From ed7333a94be6a09b42c1dd36c25a05677a4588b8 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 17:56:59 +0100 Subject: [PATCH 122/372] fix build for now, but code needs refactoring to use map center location --- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 4235adc70f..0cb69baaca 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -71,10 +71,7 @@ public class DashFavoritesFragment extends DashBaseFragment { } else { location = getLocationProvider().getLastKnownLocation(); } - //Use map center as origin if no position known - if (location == null) { - location = getMyApplication().getSettings().getLastKnownMapLocation(); - } + //TODO: Sufficient to use LatLon map center as origin if no position known! updateLocation(location); } setupFavorites(); From 5453678e1d30d5b5fea110673adc281bc26ca9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Fri, 2 Jan 2015 17:44:55 +0100 Subject: [PATCH 123/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-hu/strings.xml | 51 ++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index c58f831236..7acfd6c0a0 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -183,8 +183,15 @@ Szimuláció leállítása Szimuláció indítása - A 0.6.8 verzió változásai: \n\t- Teljesen újratervezett kereső (POI, cím)! Az új kereső sokkal gyorsabb és lehetőséget ad különféle kiindulópontok szerinti kereséshez. \n\t- Név szerinti POI keresés nagy területekre (akár országnyi) \n\t- Javítva a képernyő villódzása tableteken (641-es hiba) \n\t- Útvonal automatikus követése beállítás (356-os hiba) \n\t- GPX navigáció áthelyezve az \'Útirány\' és az \'Útvonal mentése\' az \'Útvonal mutatása\' alá \n\t- POI adatok becsomagolva az .obf fájlba (tölts le 2011. 10. 01. utáni indexadatokat) \n\t- Hangutasítás javítások (a GPS pozícióval és a parancs első kimondásával kapcsolatban) \n\t- Apró fejlesztések - + "A 0.6.8 verzió változásai: +\n\t- Teljesen újratervezett kereső (POI, cím)! Az új kereső sokkal gyorsabb és lehetőséget ad különféle kiindulópontok szerinti kereséshez. +\n\t- Név szerinti POI keresés nagy területekre (akár országnyi) +\n\t- Javítva a képernyő villódzása tableteken (641-es hiba) +\n\t- Útvonal automatikus követése beállítás (356-os hiba) +\n\t- GPX navigáció áthelyezve az „Útirány” és az „Útvonal mentése” az „Útvonal megjelenítése” alá +\n\t- POI adatok becsomagolva az .obf fájlba (tölts le 2011. 10. 01. utáni indexadatokat) +\n\t- Hangutasítás javítások (a GPS pozícióval és a parancs első kimondásával kapcsolatban) +\n\t- Apró fejlesztések " Fájl nem átnevezhető. Már létezik ilyen néven fájl. GPX útvonal @@ -219,8 +226,8 @@ GPX fájl feltöltése OSM-be. A térkép kibővítésére használják majd. %2$d darabból %1$d sikeresen feltöltve. OSM hozzájárulás - Több térképrészlet mutatása - Több részlet megmutatása (pl. utak) vektoros térképen már alacsonyabb nagyítási szinten + Több térképrészlet megjelenítése + Több részlet megjelenítése (utak, stb.) vektoros térképen már alacsonyabb nagyítási szinten Kedvenc pontok sikeresen törölve. %1$d kedvenc és %2$d kedvenc csoport törlése. Biztos? Család @@ -251,7 +258,7 @@ POI adat Cím adat - Közlekedési eszköz adat + Tömegközlekedési eszköz adatai Térképadat Deaktivált @@ -337,7 +344,7 @@ Navigáció "Ha egy adott helyre szeretnél navigálni, kattints hosszan a térképre, majd kattints az ott megjelenő buborékablakra. Keresésnél vagy Kedvencekben kattints egy elemre és válaszd a \'Navigáció ide\' menüpontot. \n\nA célpontot a térképen egy zászló jelzi, az irányát egy narancssárga háromszög, a jobb felső sarokban pedig a távolságot láthatod. -\n\nA navigációt elindítva választhatod a \'Navigáció indítása\' módot, amikor az OsmAnd hangutasításokkal, figyelmeztetésekkel végigvezet a megtervezett útvonalon, vagy választhatod az \'Útvonal mutatása\' módot, ahol csak az útvonaltervet látod, vezetés és utasítások nélkül. +\n\nA navigációt elindítva választhatod a \'Navigáció indítása\' módot, amikor az OsmAnd hangutasításokkal, figyelmeztetésekkel végigvezet a megtervezett útvonalon, vagy választhatod az \'Útvonal megjelenítése\' módot, ahol csak az útvonaltervet látod, vezetés és utasítások nélkül. \n\nHa nem a saját pozíciódról kiindulva szeretnél egy útvonalat megtervezni, válassz egy kiindulási pontot a térképen, és kattints a \'Navigáció innen\' gombra. \n\nHa a \'Navigáció innen\'-t együtt használod a \'Navigáció indítása\' móddal, az OsmAnd újratervezi az útvonalat, amint megtalálta a GPS pozíciódat. " Cím keresés @@ -468,8 +475,8 @@ Jobb megjelenítési minőség nagy felbontású eszközön A jelenlegi helyzet nem ismert Letöltés - Közlekedés keresése - Közlekedés keresése (nincs kijelölt úti cél): + Tömegközlekedés keresése + Közlekedés keresése (nincs úti cél): Közlekedés keresése ({0} az úti célig): nincs Közlekedéskeresés újrakezdése @@ -509,7 +516,7 @@ Útvonal Kedvencek OSM hibák - Tömegközlekedési megállók + Közlekedési megállók POI… Térképforrás… Térképrétegek @@ -572,8 +579,8 @@ Útvonalak Megálló megállók - Keresés utána - Keresés előtte + Következő útvonal + Előzetes útvonal Keresés vége Hol szeretnél leszállni? utána gyalog @@ -582,8 +589,8 @@ Útvonal távolsága Közlekedés OK - Tömegközlekedési megállok mutatása a térképen - Tömegközlekedési megállok mutatása + Tömegközlekedési megállok megjelenítése a térképen + Tömegközlekedési megállok megjelenítése OsmAnd navigációs alkalmazás POI adatok sikeresen frissítve ({0} db betöltve) Hiba a helyi index állományok frissítésénél @@ -628,12 +635,12 @@ Kedvenc pontok szerkesztése kész Még nincsenek kedvenc pontok Csere - Útvonal mutatása + Útvonal megjelenítése Navigáció indítása Utazás módja: Először válaszd ki a célpontot Navigáció - GPS állapot mutatása + GPS állapot megjelenítése Nyitvatartás Módosításcsomag megnyitása… Módosításcsomag lezárása… @@ -686,8 +693,8 @@ Térkép frissítés Térképcsempe újraolvasása Célpont - OpenStreetBugs mutatása a térképen - OpenStreetBugs megmutatása + OpenStreetBugs megjelenítése a térképen + OpenStreetBugs megjelenítése Kedvencek Hozzáadás a kedvencekhez Választás az eredeti és angol név között @@ -704,8 +711,8 @@ Látómező megjelenítése A térkép 3D megjelenítésének engedélyezése 3D térkép - POI mutatása a térképen (utoljára használt szűrő szerint) - POI mutatása + POI megjelenítése a térképen (utoljára használt szűrő szerint) + POI megjelenítése Térképcsempék forrásának kiválasztása Térképcsempék forrása Térkép forrása @@ -713,7 +720,7 @@ Megjelenítés térképen Térkép Beállítások - GPS koordináták mutatása a térképen + GPS koordináták megjelenítése a térképen Internet használata a hiányzó térképszeletek letöltésére Navigációs alkalmazás Kilép @@ -1389,8 +1396,8 @@ \n 2. megjegyzés: az új tárolóhelyen nem lehetséges az OsmAnd és OsmAnd+ között fájlokat megosztani. Szeretnéd, hogy az OsmAnd az adatokat az új helyre másolja? A „Nem” választásával az OsmAnd létrehozza az új mappát és azt használja. %s fájl másolása az új helyre… - OsmAnd adatainak másolása új helyre (%s) - OsmAnd adatok másolása + OsmAnd adatainak másolása az új helyre (%s)… + OsmAnd adatfájlok másolása… OsmAnd offline útvonal tervezése Teherautó Navigációs beállítások From 8ac27329d1c157eb5ea192834d7d4ca2b00d47d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Fri, 2 Jan 2015 17:40:27 +0100 Subject: [PATCH 124/372] Translated using Weblate (Polish) Currently translated at 36.9% (226 of 611 strings) --- OsmAnd/res/values-pl/phrases.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index 0da7123d67..38c09864e4 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -222,4 +222,25 @@ Sztolnia Szyb ropy naftowej Wiatrak + Kamieniołom + Winnica + Sad + Szkoła nauki jazdy + Szkoła + Przedszkole + Uczelnia + Uniwersytet + + Placówka społeczna + Sąd + Więzienie + Urząd stanu cywilnego + Ambasada + Rząd + Komornik + Prokurator + Fundusz emerytalny + Urząd podatkowy + Urząd + Urząd celny From 112d8db27c8a5ab9f66868f96da0911565423a63 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 18:21:25 +0100 Subject: [PATCH 125/372] refactor DashFavoritesFragment to use LatLon only --- .../plus/dashboard/DashFavoritesFragment.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 0cb69baaca..3d92af45fb 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -36,7 +36,8 @@ import java.util.List; */ public class DashFavoritesFragment extends DashBaseFragment { public static final String TAG = "DASH_FAVORITES_FRAGMENT"; - private net.osmand.Location location = null; + //private net.osmand.Location location = null; + private LatLon location = null; private Float heading = null; private List arrows = new ArrayList(); List points = new ArrayList(); @@ -67,11 +68,15 @@ public class DashFavoritesFragment extends DashBaseFragment { if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) { if(!getMyApplication().getSettings().isLastKnownMapLocation()) { // show first time when application ran - location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); + //location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); + location = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitide(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude()); } else { - location = getLocationProvider().getLastKnownLocation(); + //location = getLocationProvider().getLastKnownLocation(); + location = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude()) + } + if (location == null) { + location = getMyApplication().getSettings().getLastKnownMapLocation(); } - //TODO: Sufficient to use LatLon map center as origin if no position known! updateLocation(location); } setupFavorites(); @@ -174,7 +179,7 @@ public class DashFavoritesFragment extends DashBaseFragment { updateArrows(); } - public void updateLocation(Location location) { + public void updateLocation(LatLon location) { if (location == null){ return; } From a1f1211dcfd21a0b3794bc237d9346e43d6194b0 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 18:25:52 +0100 Subject: [PATCH 126/372] fix typo --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 3d92af45fb..b2e5b3b02d 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -72,7 +72,7 @@ public class DashFavoritesFragment extends DashBaseFragment { location = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitide(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude()); } else { //location = getLocationProvider().getLastKnownLocation(); - location = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude()) + location = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude()); } if (location == null) { location = getMyApplication().getSettings().getLastKnownMapLocation(); From a1413c7cd744b51c157b85a44a18189afea4c5c1 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 18:35:44 +0100 Subject: [PATCH 127/372] fix more typos --- OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 2 +- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 59ea76be4a..e22ded18f6 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -512,7 +512,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca } @Override - public void updateLocation(Location location) { + public void updateLocation(LatLon location) { for (WeakReference ref : fragList) { Fragment f = ref.get(); if (f instanceof DashFavoritesFragment && !f.isDetached()) { diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index b2e5b3b02d..65f2ad3652 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -69,7 +69,7 @@ public class DashFavoritesFragment extends DashBaseFragment { if(!getMyApplication().getSettings().isLastKnownMapLocation()) { // show first time when application ran //location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); - location = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitide(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude()); + location = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitude(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude()); } else { //location = getLocationProvider().getLastKnownLocation(); location = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude()); From 936391acc82a031e5f0afab749f614ce2fd9854a Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 18:41:15 +0100 Subject: [PATCH 128/372] declare LatLon --- OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index e22ded18f6..1ff5d8635d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -8,6 +8,7 @@ import java.util.Random; import net.osmand.Location; import net.osmand.access.AccessibleAlertBuilder; +import net.osmand.data.LatLon; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; From 7eed54e2ab3ee3b45dc0a3e75a363e462e4d734c Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 18:52:04 +0100 Subject: [PATCH 129/372] Remove update routine to check result --- .../plus/activities/MainMenuActivity.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 1ff5d8635d..4c7f172e90 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -512,15 +512,16 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca } } - @Override - public void updateLocation(LatLon location) { - for (WeakReference ref : fragList) { - Fragment f = ref.get(); - if (f instanceof DashFavoritesFragment && !f.isDetached()) { - ((DashFavoritesFragment) f).updateLocation(location); - } - } - } + //Remove for now to check error + //@Override + //public void updateLocation(LatLon location) { + // for (WeakReference ref : fragList) { + // Fragment f = ref.get(); + // if (f instanceof DashFavoritesFragment && !f.isDetached()) { + // ((DashFavoritesFragment) f).updateLocation(location); + // } + // } + //} private OsmAndLocationProvider getLocationProvider() { return getMyApplication().getLocationProvider(); From 6a2ce57a4b5ad67c91dd74a68286ad1231c06ddb Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 19:26:01 +0100 Subject: [PATCH 130/372] confine fix to Fragment --- .../plus/activities/MainMenuActivity.java | 20 ++++++++--------- .../plus/dashboard/DashFavoritesFragment.java | 22 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 4c7f172e90..59ea76be4a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -8,7 +8,6 @@ import java.util.Random; import net.osmand.Location; import net.osmand.access.AccessibleAlertBuilder; -import net.osmand.data.LatLon; import net.osmand.plus.OsmAndAppCustomization; import net.osmand.plus.OsmAndLocationProvider; import net.osmand.plus.OsmandApplication; @@ -512,16 +511,15 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca } } - //Remove for now to check error - //@Override - //public void updateLocation(LatLon location) { - // for (WeakReference ref : fragList) { - // Fragment f = ref.get(); - // if (f instanceof DashFavoritesFragment && !f.isDetached()) { - // ((DashFavoritesFragment) f).updateLocation(location); - // } - // } - //} + @Override + public void updateLocation(Location location) { + for (WeakReference ref : fragList) { + Fragment f = ref.get(); + if (f instanceof DashFavoritesFragment && !f.isDetached()) { + ((DashFavoritesFragment) f).updateLocation(location); + } + } + } private OsmAndLocationProvider getLocationProvider() { return getMyApplication().getLocationProvider(); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 65f2ad3652..5a69c94e8d 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -36,8 +36,8 @@ import java.util.List; */ public class DashFavoritesFragment extends DashBaseFragment { public static final String TAG = "DASH_FAVORITES_FRAGMENT"; - //private net.osmand.Location location = null; - private LatLon location = null; + private net.osmand.Location location = null; + private LatLon loc = null; private Float heading = null; private List arrows = new ArrayList(); List points = new ArrayList(); @@ -68,16 +68,16 @@ public class DashFavoritesFragment extends DashBaseFragment { if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) { if(!getMyApplication().getSettings().isLastKnownMapLocation()) { // show first time when application ran - //location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); - location = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitude(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude()); + location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); + loc = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitude(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude()); } else { - //location = getLocationProvider().getLastKnownLocation(); - location = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude()); + location = getLocationProvider().getLastKnownLocation(); + loc = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude()); } - if (location == null) { - location = getMyApplication().getSettings().getLastKnownMapLocation(); + if (loc == null) { + loc = getMyApplication().getSettings().getLastKnownMapLocation(); } - updateLocation(location); + updateLocation(loc); } setupFavorites(); } @@ -166,7 +166,7 @@ public class DashFavoritesFragment extends DashBaseFragment { private void updateArrow(FavouritePoint point, ImageView direction) { float[] mes = new float[2]; LatLon l = new LatLon(point.getLatitude(), point.getLongitude()); - Location.distanceBetween(l.getLatitude(), l.getLongitude(), location.getLatitude(), location.getLongitude(), mes); + Location.distanceBetween(l.getLatitude(), l.getLongitude(), loc.getLatitude(), loc.getLongitude(), mes); DirectionDrawable draw = new DirectionDrawable(getActivity(), 10, 10, true); Float h = heading; float a = h != null ? h : 0; @@ -183,7 +183,7 @@ public class DashFavoritesFragment extends DashBaseFragment { if (location == null){ return; } - this.location = location; + this.loc = loc; updateArrows(); } From 2cb9cc97577331e6953d9fae2be9f27d2968d8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Michalski?= Date: Fri, 2 Jan 2015 19:17:25 +0100 Subject: [PATCH 131/372] Translated using Weblate (Polish) Currently translated at 37.6% (230 of 611 strings) --- OsmAnd/res/values-pl/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml index 38c09864e4..9856ff8ec7 100644 --- a/OsmAnd/res/values-pl/phrases.xml +++ b/OsmAnd/res/values-pl/phrases.xml @@ -243,4 +243,8 @@ Urząd podatkowy Urząd Urząd celny + Miasto + Miasto + Wieś + Wioska From 2d5b853eb3394fc7cd045910f9ac75e1c1c61788 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 19:38:02 +0100 Subject: [PATCH 132/372] fix build --- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 5a69c94e8d..04ca76dd33 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -77,7 +77,7 @@ public class DashFavoritesFragment extends DashBaseFragment { if (loc == null) { loc = getMyApplication().getSettings().getLastKnownMapLocation(); } - updateLocation(loc); + updateLocation(location); } setupFavorites(); } @@ -179,11 +179,12 @@ public class DashFavoritesFragment extends DashBaseFragment { updateArrows(); } - public void updateLocation(LatLon location) { + public void updateLocation(Location location) { if (location == null){ return; } - this.loc = loc; + this.location = location; + this.loc = new LatLon(location.getLatitude(), location.getLongitude()); updateArrows(); } From 1769542fea5aae2c8877265d90d7d33b086a6673 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 19:55:32 +0100 Subject: [PATCH 133/372] fix build --- .../plus/dashboard/DashFavoritesFragment.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 04ca76dd33..93bf019e6c 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -69,13 +69,8 @@ public class DashFavoritesFragment extends DashBaseFragment { if(!getMyApplication().getSettings().isLastKnownMapLocation()) { // show first time when application ran location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); - loc = new LatLon(getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLatitude(), getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation().getLongitude()); } else { location = getLocationProvider().getLastKnownLocation(); - loc = new LatLon(getLocationProvider().getLastKnownLocation().getLatitude(), getLocationProvider().getLastKnownLocation().getLongitude()); - } - if (loc == null) { - loc = getMyApplication().getSettings().getLastKnownMapLocation(); } updateLocation(location); } @@ -180,11 +175,17 @@ public class DashFavoritesFragment extends DashBaseFragment { } public void updateLocation(Location location) { - if (location == null){ - return; + //if (location == null) { + // return; + //} + if (location != null) { + this.location = location; + loc = new LatLon(location.getLatitude(), location.getLongitude()); } - this.location = location; - this.loc = new LatLon(location.getLatitude(), location.getLongitude()); + if (loc == null) { + loc = getMyApplication().getSettings().getLastKnownMapLocation(); + } + this.loc = loc; updateArrows(); } From 43efb357db3c308e6dca46daf1ee605fe9919d80 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 23:51:46 +0100 Subject: [PATCH 134/372] consolidate a few lines --- .../osmand/plus/dashboard/DashFavoritesFragment.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 93bf019e6c..c4283cf95e 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -175,15 +175,13 @@ public class DashFavoritesFragment extends DashBaseFragment { } public void updateLocation(Location location) { - //if (location == null) { - // return; - //} if (location != null) { - this.location = location; + //this.location = location; loc = new LatLon(location.getLatitude(), location.getLongitude()); - } - if (loc == null) { + } else if (getMyApplication().getSettings().getLastKnownMapLocation() != null) { loc = getMyApplication().getSettings().getLastKnownMapLocation(); + } else { + return; } this.loc = loc; updateArrows(); From bccf53e28f3c235c2ff4cf66229289fc55fedf78 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 23:54:53 +0100 Subject: [PATCH 135/372] fix bug that arrow do not always appear --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index c4283cf95e..befc596a2b 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -116,7 +116,7 @@ public class DashFavoritesFragment extends DashBaseFragment { ImageView icon = (ImageView) view.findViewById(R.id.icon); ImageView direction = (ImageView) view.findViewById(R.id.direction); - if(location != null){ + if(loc != null){ direction.setVisibility(View.VISIBLE); updateArrow(point, direction); } From 5996a1ef5cb040443a4e9789a870dc2f1568c7d3 Mon Sep 17 00:00:00 2001 From: sonora Date: Fri, 2 Jan 2015 23:57:23 +0100 Subject: [PATCH 136/372] one more correction for fix --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index befc596a2b..0075371e54 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -148,7 +148,7 @@ public class DashFavoritesFragment extends DashBaseFragment { } private void updateArrows() { - if (location == null) { + if (loc == null) { return; } From 7b0c08126af95c6aaf5a0d78898f4ddb25263823 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 11:51:57 +0100 Subject: [PATCH 137/372] consolidate code, reference only loc, this should also fix wrong initial arrow direction on non-compass devices --- .../plus/dashboard/DashFavoritesFragment.java | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 0075371e54..388dcb825d 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -65,14 +65,22 @@ public class DashFavoritesFragment extends DashBaseFragment { @Override public void onResume() { super.onResume(); - if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) { - if(!getMyApplication().getSettings().isLastKnownMapLocation()) { - // show first time when application ran - location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); - } else { - location = getLocationProvider().getLastKnownLocation(); - } - updateLocation(location); + + //'location' seems actually not needed in this Fragment, as both setupFavorites and updateArrow only reference lastKnownMapLocation + //if (getMyApplication().getFavorites().getFavouritePoints().size() > 0) { + // if(!getMyApplication().getSettings().isLastKnownMapLocation()) { + // // show first time when application ran + // location = getMyApplication().getLocationProvider().getFirstTimeRunDefaultLocation(); + // } else { + // location = getLocationProvider().getLastKnownLocation(); + // } + //} + + //This is used as origin for both Fav-list and direction arrows + if (getMyApplication().getSettings().getLastKnownMapLocation() != null) { + loc = getMyApplication().getSettings().getLastKnownMapLocation(); + } else { + loc = new LatLon(0f, 0f); } setupFavorites(); } @@ -90,14 +98,15 @@ public class DashFavoritesFragment extends DashBaseFragment { } else { (mainView.findViewById(R.id.main_fav)).setVisibility(View.VISIBLE); } + Collections.sort(points, new Comparator() { @Override public int compare(FavouritePoint point, FavouritePoint point2) { - LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation(); + //LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation(); int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(), - lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude())); + loc.getLatitude(), loc.getLongitude())); int dist2 = (int) (MapUtils.getDistance(point2.getLatitude(), point2.getLongitude(), - lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude())); + loc.getLatitude(), loc.getLongitude())); return (dist - dist2); } }); @@ -123,9 +132,9 @@ public class DashFavoritesFragment extends DashBaseFragment { arrows.add(direction); name.setText(point.getName()); icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(), point.getColor())); - LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation(); + //LatLon lastKnownMapLocation = getMyApplication().getSettings().getLastKnownMapLocation(); int dist = (int) (MapUtils.getDistance(point.getLatitude(), point.getLongitude(), - lastKnownMapLocation.getLatitude(), lastKnownMapLocation.getLongitude())); + loc.getLatitude(), loc.getLongitude())); String distance = OsmAndFormatter.getFormattedDistance(dist, getMyApplication()) + " "; view.findViewById(R.id.navigate_to).setOnClickListener(new View.OnClickListener() { @Override @@ -145,6 +154,7 @@ public class DashFavoritesFragment extends DashBaseFragment { }); favorites.addView(view); } + updateLocation(location); } private void updateArrows() { @@ -175,14 +185,24 @@ public class DashFavoritesFragment extends DashBaseFragment { } public void updateLocation(Location location) { - if (location != null) { + //'location' seems actually not needed in this Fragment, as both setupFavorites and updateArrow only reference lastKnownMapLocation + //if (location != null) { //this.location = location; - loc = new LatLon(location.getLatitude(), location.getLongitude()); - } else if (getMyApplication().getSettings().getLastKnownMapLocation() != null) { + //Next line commented out so that reference is always lastKnownMapLocation, because this is also always used as reference in setupFavorites + // loc = new LatLon(location.getLatitude(), location.getLongitude()); + //} else if (getMyApplication().getSettings().getLastKnownMapLocation() != null) { + // loc = getMyApplication().getSettings().getLastKnownMapLocation(); + //} else { + // return; + //} + + //This is used as origin for both Fav-list and direction arrows + if (getMyApplication().getSettings().getLastKnownMapLocation() != null) { loc = getMyApplication().getSettings().getLastKnownMapLocation(); } else { - return; + loc = new LatLon(0f, 0f); } + this.loc = loc; updateArrows(); } From 5ee1e8202c7733c80faf228d85f1e79a10e7b362 Mon Sep 17 00:00:00 2001 From: Roberto GEB Date: Sat, 3 Jan 2015 10:03:40 +0100 Subject: [PATCH 138/372] Translated using Weblate (Spanish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-es/strings.xml | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 63519a0778..20141c2f6e 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -196,7 +196,7 @@ Datos de PDI Datos de direcciones - Datos de transporte + Datos de transporte público Datos de mapa Desactivado Datos de voz (sintetizado) @@ -412,9 +412,9 @@ No estira (ni hace borrosas) las teselas de mapa en pantallas de alta densidad Posición aún desconocida Descargar - Buscar transporte - Resultados transporte (sin destino): - Resultados transporte ({0} al destino): + Buscar transporte público + Resultados de transporte (sin destino): + Resultados de transporte ({0} al destino): ninguno Reiniciar búsqueda de transporte Mapa @@ -425,7 +425,7 @@ Traza GPX… Error leyendo datos GPX Mapas vectoriales descargados - buscar transporte en parada + Buscar transporte en parada Localización:\n Lat %1$.5f\n Lon %2$.5f Fallo Modificar PDI @@ -517,17 +517,17 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Rutas Parada paradas - Ruta subsiguiente - Ruta previa + Itinerario siguiente + Itinerario anterior Finalizar búsqueda Elige parada a la que ir distancia previa distancia siguiente paradas a pasar - Distancia de ruta + Distancia del itinerario Transporte Aceptar - Mostrar paradas de transporte público en el mapa + Muestra paradas de transporte público en el mapa Mostrar paradas de transporte Aplicación de navegación OsmAnd Datos de PDIs correctamente actualizados (se cargaron {0}) @@ -867,7 +867,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Buscar PDI (Punto De Interes) Buscar dirección Coordenadas - Buscar transportes + Búsqueda de transporte público Buscar favorito Historial de búsqueda Hacer todas las características del terreno transparentes en el mapa @@ -1026,7 +1026,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Modo Avanzado… Aparcamiento Emergencia - Transporte Público + Transporte público Entretenimiento Alojamiento Restaurantes @@ -1455,9 +1455,9 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Especifica la velocidad en el habla sintetizada (TTS) Velocidad del habla sintetizada (TTS) ¿Quieres que OsmAnd copie sus archivos de datos al nuevo destino? Selecciona \'No\' para que OsmAnd cree y use la nueva carpeta. - Copiando archivo (%s) al nuevo destino... - Copiando archivos de OsmAnd al nuevo destino (%s) - Copiando archivos de datos de OsmAnd + Copiando archivo (%s) al nuevo destino… + Copiando archivos de OsmAnd al nuevo destino (%s)… + Copiando archivos de datos de OsmAnd… Camión Falló el cálculo rápido de la ruta (%s), regresando a cálculo lento. Deshabilitar la planificación de ruta de dos fases para la navegación con automóvil @@ -1483,10 +1483,10 @@ Para poder usar muchas características de la aplicación necesitas algunos dato \n Nota 2: En la nueva ubicación de almacenamiento no será posible compartir archivos entre OsmAnd y OsmAnd+. ¿Desea usar la ruta mostrada para la navegación? Añadir como punto de destino - Seleccionar GPX … + Seleccionar GPX… Seleccionar destino - Seleccionar en el mapa … - Favorito … + Seleccionar en el mapa… + Favorito… Preferencias de la ruta Información de la ruta "Cambios en 1.7: @@ -1583,7 +1583,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Nombre de usuario Dispositivos conectados - Esperando autorización... + Esperando autorización… Localizaciones enviadas %1$d (en buffer %2$d) Conexión establecida: %1$s Grupos/Dispositivos OsMo @@ -1673,7 +1673,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato La traza GPX está vacía Pista seleccionada Todas las pistas - Cargando %1$s … + Cargando %1$s… \n\nMantenga pulsado para ver el mapa Iniciar automáticamente la navegación giro a giro seleccionado @@ -1760,7 +1760,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Superponer símbolo de senderismo Dibujar caminos de acuerdo a las trazas de OSMC - Invitar... + Invitar… ¿Quieres abandonar el grupo %1$s? Especifique el id Pronto @@ -1776,7 +1776,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Coche Bicicleta Peatón - Más... + Más… ¿Descargar los mapas que faltan %1$s (%2$d MB)? Todos Puntos de ruta From a6d9f1f7bd24abba2ac77dd5ef1b63f7dc89537f Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 13:21:14 +0100 Subject: [PATCH 139/372] change en string to make clear POI is plural here --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 5573099040..57ae7bc93a 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1665,7 +1665,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A km/h m Deprecated map data format \'\'{0}\'\' is not supported - Closest POI + Closest POIs Custom filter Online NameFinder Reading cached tiles… From deb1b8b2ee1d34b0160d6b2930310f9d5bee40d6 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 13:42:11 +0100 Subject: [PATCH 140/372] Clarify that _all_ POIs within search radius will be shown --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 57ae7bc93a..dab5938d1d 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1665,7 +1665,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A km/h m Deprecated map data format \'\'{0}\'\' is not supported - Closest POIs + All closest POIs Custom filter Online NameFinder Reading cached tiles… From 36529cef763d81b3c568734fe8dcaafe45c80a06 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sat, 3 Jan 2015 13:30:28 +0100 Subject: [PATCH 141/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 121c2dd3d7..7b48f343ba 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -523,7 +523,7 @@ iardes mph milles -PDI més proper +PDIs més propers Mostra el lloc web del PDI Telèfon Tipus de filtre From 43ff22ad7845ba1e843f27f781a7713757639cc8 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sat, 3 Jan 2015 13:39:07 +0100 Subject: [PATCH 142/372] Translated using Weblate (Danish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index e41a66f79c..dd74320e28 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -816,7 +816,7 @@ km/t m Forældet kortdataformat \'{0}\' er ikke understøttet - Nærmeste interessepunkt + Nærmeste interessepunkter Brugerdefineret filter Online navne-søger Læser cachelagrede delkort… From 0573b2ef9f7795745be0493338535715648ce5a2 Mon Sep 17 00:00:00 2001 From: Massimiliano Caniparoli Date: Sat, 3 Jan 2015 13:38:38 +0100 Subject: [PATCH 143/372] Translated using Weblate (Italian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-it/strings.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index f47ff99c5f..0c2b50dc0f 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1038,14 +1038,13 @@ \n\t* \'Nella direzione del movimento\' - La mappa sarà sempre allineata alla vostra direzione \n\t* \'Con la bussola\' - La mappa sarà sempre allineata alla lettura della bussola del dispositivo -L\'aspetto della mappa può, per alcune mappe vettoriali, essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e meno fastidiosi per la guida di notte. - \n\nSi può impostare una regola per il cambio giorno/notte in \'Menu\' → \'Configurazione schermo…\' → \'Mappa giorno/notte\'. - \n\nLe opzioni sono: - \n\t* \'Alba/Tramonto\': automatico, in base alla posizione del sole (preimpostato) - \n\t* \'Giorno\': usa sempre il modo diurno - \n\t* \'Notte\': usa sempre il modo notturno - \n\t* \'Sensore di luminosità\': l\'aspetto della mappa è controllato dal sensore di luminosità del dispositivo (solo se presente) - +"L\'aspetto della mappa può, per alcune mappe vettoriali, essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e più confortevoli per la guida di notte. +\n\nSi può impostare una regola per il cambio giorno/notte in \'Menu\' → \'Configurazione schermo…\' → \'Mappa giorno/notte\'. +\n\nLe opzioni sono: +\n\t* \'Alba/Tramonto\': automatico, in base alla posizione del sole (preimpostato) +\n\t* \'Giorno\': usa sempre il modo diurno +\n\t* \'Notte\': usa sempre il modo notturno +\n\t* \'Sensore di luminosità\': l\'aspetto della mappa è controllato dal sensore di luminosità del dispositivo (solo se presente) " "La sorgente della mappa e i livelli visualizzati sono cambiati attraverso \'Menu\'->\'Configura la mappa\'. \n\nSotto \'Sorgente mappa…\' puoi scegliere di usare le mappe vettoriali offline precaricate (predefinito, sono necessarie anche per la navigazione offline), le sorgenti di tasselli predefinite -online o caricate in cache offline- (attiva il plugin \'Mappe online\' in \'Impostazioni\' → \'Gestore plugin\' per averle), o mappe create manualmente usando per esempio OsmAndMapCreator sul PC. \n\nOsmAnd supporta anche sorgenti personalizzate. " From 9649daf048a611d3fcde05c225a31c3b3fb4bfab Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sat, 3 Jan 2015 13:46:10 +0100 Subject: [PATCH 144/372] Translated using Weblate (Slovak) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-sk/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 54a8c23be7..48f738576b 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -545,7 +545,7 @@ km/h m Zastaralý formát mapových údajov "{0}" nie je podporovaný - Najbližší bod záujmu + Najbližšie body záujmu Vlastný filter Online hľadač mien Načítavajú sa dlaždice zo zásobníka… From 4d5f512b40e438a8a337d9ef809baddd6ad2079b Mon Sep 17 00:00:00 2001 From: Massimiliano Caniparoli Date: Sat, 3 Jan 2015 13:45:46 +0100 Subject: [PATCH 145/372] Translated using Weblate (Italian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-it/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 0c2b50dc0f..5ebcab8075 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1038,8 +1038,8 @@ \n\t* \'Nella direzione del movimento\' - La mappa sarà sempre allineata alla vostra direzione \n\t* \'Con la bussola\' - La mappa sarà sempre allineata alla lettura della bussola del dispositivo -"L\'aspetto della mappa può, per alcune mappe vettoriali, essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e più confortevoli per la guida di notte. -\n\nSi può impostare una regola per il cambio giorno/notte in \'Menu\' → \'Configurazione schermo…\' → \'Mappa giorno/notte\'. +"Per le mappe vettoriali offline, l\'aspetto della mappa può essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e meno fastidiosi per la guida di notte. +\n\nSi può impostare una regola per il cambio giorno/notte in \'Menu\' → \'Configura la mappa\' → \'Mappa giorno/notte\'. \n\nLe opzioni sono: \n\t* \'Alba/Tramonto\': automatico, in base alla posizione del sole (preimpostato) \n\t* \'Giorno\': usa sempre il modo diurno From dfd5608c891c3b80074032c6fcfb0c1afd96ef2f Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 14:21:06 +0100 Subject: [PATCH 146/372] Limit POI arrow updates to >3 degrees and see if commenting out Handler solves issues on some devices --- .../activities/search/SearchPOIActivity.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index f3fbdce6c8..7d5e121ed6 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -506,17 +506,27 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa @Override public void updateCompassValue(float value) { + float lastHeading = heading; heading = value; - if(!uiHandler.hasMessages(COMPASS_REFRESH_MSG_ID)){ - Message msg = Message.obtain(uiHandler, new Runnable(){ - @Override - public void run() { - amenityAdapter.notifyDataSetChanged(); - } - }); - msg.what = COMPASS_REFRESH_MSG_ID; - uiHandler.sendMessageDelayed(msg, 100); + if(heading != null && lastheading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 3) { + @Override + public void run() { + amenityAdapter.notifyDataSetChanged(); + } + } else { + heading = lastHeading; } + //Comment out and use lastHeading above to see if this fixes issues seen on some devices + //if(!uiHandler.hasMessages(COMPASS_REFRESH_MSG_ID)){ + // Message msg = Message.obtain(uiHandler, new Runnable(){ + // @Override + // public void run() { + // amenityAdapter.notifyDataSetChanged(); + // } + // }); + // msg.what = COMPASS_REFRESH_MSG_ID; + // uiHandler.sendMessageDelayed(msg, 100); + //} } From 650172c61c606978c272e32b98b6c46d1f463197 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Sat, 3 Jan 2015 14:11:23 +0100 Subject: [PATCH 147/372] Translated using Weblate (French) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-fr/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 4cc3021a23..17cda20090 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -359,7 +359,7 @@ m Le format obsolète de la carte \'\'{0}\'\' n\'\'est pas supporté Pour conducteurs - PI les plus proches + Tous les Points d\'Intérêt les plus proches Filtre personnalisé Alimentation Pour voyageurs @@ -434,7 +434,7 @@ Trace GPX… Erreur de lecteur des données GPX Cartes vectorielles OSM - Chercher un transport à l\'arrivée + Rechercher un transport à l\'arrivée Position :\n Lat. %1$.5f\n Lon. %2$.5f Bogue Modifier PI From e5302f91441a8c428a1315d15d4e4df7fe3975f0 Mon Sep 17 00:00:00 2001 From: Massimiliano Caniparoli Date: Sat, 3 Jan 2015 14:14:01 +0100 Subject: [PATCH 148/372] Translated using Weblate (Italian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-it/strings.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 5ebcab8075..08d1647880 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -142,7 +142,7 @@ Fissato Posizione corrente… Ultima vista mappa - Cerca vicino a: + Origine: Cerca nelle vicinanze Novità nella versione 0.6.7: \n\t- Manager dati offline (scaricare, eliminare e backup di dati offline direttamente da OsmAnd) @@ -223,7 +223,7 @@ Non usare Nessuna Scompattazione nuovi dati… - E\' selezionato un servizio di navigazione online ma la connessione a internet non è disponibile. + È stato selezionato un servizio di navigazione online, ma la connessione a Internet non è disponibile. Lingua non supportata La lingua selezionata non è supportata nel motore TTS (text-to-speech) Android installato. Vuoi vedere in Market un altro motore TTS? Altrimenti verrà utilizzata la lingua TTS preimpostata. Dati mancanti @@ -342,7 +342,7 @@ Sport Alimentari Turismo - Trasporto + Trasporti pubblici Indicizzazione indirizzi… Indicizzazione mappa… Indicizzazione PDI… @@ -353,7 +353,7 @@ m Il formato dati mappa \'\'{0}\'\' è deprecato e non è supportato Servizi automobile - PDI più vicini + Tutti i PDI più vicini Filtro personalizzato Alimentari Turistico @@ -521,14 +521,14 @@ Percorsi Fermata fermate - Percorso successivo - Percorso precedente + Itinerario successivo + Itinerario precedente Completa la ricerca Scegli ferma per uscire distanza precedente distanza successiva fermate da passare - Distanza percorso + Distanza itinerario Trasporto pubblico OK Visualizza le fermate di trasporto pubblico sulla mappa @@ -1655,7 +1655,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz \n\t* Molte piccole migliorie dell\'interfaccia utente & correzioni usabilità \n\t* Impostazioni della velocità della vocalizzazione - Calcola un tratto di percorso OsmAnd senza l\'utilizzo di internet + Calcola un tratto di percorso OsmAnd senza l\'utilizzo di Internet Calcola una percorso OsmAnd per il primo e l\'ultimo tratto del percorso Oggetto non trovato Inglese @@ -1842,7 +1842,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Traccia attualmente in registrazione selezionato Intervallo suddivisione - Caricamento di %1$s … + Caricamento di %1$s… Tappa \n\nTieni premuto per vederlo sulla mappa Avvia la navigazione passo per passo automaticamente @@ -2009,7 +2009,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz MOSTRA TUTTO Coordinate Schermata iniziale - Ci sono %1$s aggiornamenti per le mappe + Ci sono aggiornamenti per %1$s mappe Cerca MOSTRA LA MAPPA Nessuna alternativa trovata @@ -2037,9 +2037,9 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Atlante strade tedesche Atlante strade americane Non usare il calcolo del percorso v1.9 - Non usare il calcolo del percorso v1.9 - Ferrovie - Pedonale + Non usare le regole di calcolo del percorso introdotte nella v1.9 + Passaggio a livello + Attraversamento pedonale Mostra i passaggi a livello Mostra gli attraversamenti pedonali Annuncia gli attraversamenti pedonali From 04d2a25c226a1dcce5ed5be52f67b75e46a54914 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 14:27:05 +0100 Subject: [PATCH 149/372] fiy typo --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 7d5e121ed6..bc118c558c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -508,7 +508,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa public void updateCompassValue(float value) { float lastHeading = heading; heading = value; - if(heading != null && lastheading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 3) { + if(heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 3) { @Override public void run() { amenityAdapter.notifyDataSetChanged(); From 1aa0a026f8828ec3f9f97d8715ea81ef81094734 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 14:28:33 +0100 Subject: [PATCH 150/372] limit arrow update on dashboard to >3 degrees --- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 388dcb825d..8b3cf4b369 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -180,8 +180,15 @@ public class DashFavoritesFragment extends DashBaseFragment { } public void updateCompassValue(float value) { + //heading = value; + //updateArrows(); + float lastHeading = heading; heading = value; - updateArrows(); + if (heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 3) { + updateArrows(); + } else { + heading = lastHeading + } } public void updateLocation(Location location) { From d1b390288b5e4304f3be068066ad2dc94f8f5669 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 14:36:41 +0100 Subject: [PATCH 151/372] fix typos --- .../osmand/plus/activities/search/SearchPOIActivity.java | 7 ++----- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index bc118c558c..d00d11e5d1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -508,11 +508,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa public void updateCompassValue(float value) { float lastHeading = heading; heading = value; - if(heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 3) { - @Override - public void run() { - amenityAdapter.notifyDataSetChanged(); - } + if (heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { + amenityAdapter.notifyDataSetChanged(); } else { heading = lastHeading; } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 8b3cf4b369..a7424b7a19 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -184,10 +184,10 @@ public class DashFavoritesFragment extends DashBaseFragment { //updateArrows(); float lastHeading = heading; heading = value; - if (heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 3) { + if (heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { updateArrows(); } else { - heading = lastHeading + heading = lastHeading; } } From 70930ba5c2ceca48832cae1c03ec9e8a743f4d93 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 15:01:46 +0100 Subject: [PATCH 152/372] fix build --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 3 ++- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index d00d11e5d1..da66c4d50d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -43,6 +43,7 @@ import net.osmand.plus.dialogs.DirectionsDialogs; import net.osmand.plus.render.RenderingIcons; import net.osmand.plus.views.DirectionDrawable; import net.osmand.util.Algorithms; +import net.osmand.util.MapUtils; import net.osmand.util.OpeningHoursParser; import net.osmand.util.OpeningHoursParser.OpeningHours; import android.app.AlertDialog; @@ -508,7 +509,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa public void updateCompassValue(float value) { float lastHeading = heading; heading = value; - if (heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { + if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { amenityAdapter.notifyDataSetChanged(); } else { heading = lastHeading; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index a7424b7a19..9bac717706 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -184,7 +184,7 @@ public class DashFavoritesFragment extends DashBaseFragment { //updateArrows(); float lastHeading = heading; heading = value; - if (heading != null && lastHeading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { + if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { updateArrows(); } else { heading = lastHeading; From 7cd99765f5d649edcf9880c3023d7d97093fe773 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 15:24:59 +0100 Subject: [PATCH 153/372] avoid NPE --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 2 +- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index da66c4d50d..3e60b44f87 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -507,7 +507,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa @Override public void updateCompassValue(float value) { - float lastHeading = heading; + float lastHeading = heading != null ? heading : 99; heading = value; if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { amenityAdapter.notifyDataSetChanged(); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 9bac717706..d07fa0ac4b 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -182,7 +182,7 @@ public class DashFavoritesFragment extends DashBaseFragment { public void updateCompassValue(float value) { //heading = value; //updateArrows(); - float lastHeading = heading; + float lastHeading = heading != null ? heading : 99; heading = value; if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { updateArrows(); From 2b2a8e54c932a1e026604260efd6164c256b11bf Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 15:45:23 +0100 Subject: [PATCH 154/372] Change to nearest as per discussion result --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index dab5938d1d..73f1c0e6a7 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1665,7 +1665,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A km/h m Deprecated map data format \'\'{0}\'\' is not supported - All closest POIs + Nearest POIs Custom filter Online NameFinder Reading cached tiles… From 33789556f393f3b7544097a2dfcfceee4a1a6e9c Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 15:56:23 +0100 Subject: [PATCH 155/372] try fix empty DashFavoritesList issue --- .../src/net/osmand/plus/activities/FavouritesListFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java index b0d1f70c1c..789b951831 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java @@ -156,6 +156,7 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear } } }); + notifyDataSetChanged(); } public FavouritesAdapter(Activity activity, List list) { From 3760602e0e1530c32026daa1fd958dc06b053215 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Sat, 3 Jan 2015 15:56:34 +0100 Subject: [PATCH 156/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1594 strings) --- OsmAnd/res/values-sv/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 000330f9a5..265bbeb5b4 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -470,7 +470,7 @@ Ladda om från SD-kort Ladda ner -POI-data +Intressepunktsdata Adressdata Kollektivtrafikdata Kartdata @@ -596,7 +596,7 @@ m Det föråldrade kartdataformatet \"{0}\" stöds inte Bilhjälp -Närmaste POI +Närmaste intressepunkt Anpassat filter Mataffär För turister From ca641775c80afdf209de9e251367d71f19d5d33e Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 16:23:40 +0100 Subject: [PATCH 157/372] try with invalidate() --- .../src/net/osmand/plus/activities/FavouritesListFragment.java | 1 - OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java index 789b951831..b0d1f70c1c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java @@ -156,7 +156,6 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear } } }); - notifyDataSetChanged(); } public FavouritesAdapter(Activity activity, List list) { diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index d07fa0ac4b..f0045ab4ad 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -155,6 +155,7 @@ public class DashFavoritesFragment extends DashBaseFragment { favorites.addView(view); } updateLocation(location); + mainView.invalidate(); } private void updateArrows() { From dd04b47223c11594a7835cae67aa7c2a946eba5d Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Sat, 3 Jan 2015 15:58:19 +0100 Subject: [PATCH 158/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1594 strings) --- OsmAnd/res/values-sv/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 265bbeb5b4..35469516e9 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -478,7 +478,7 @@ Röstdata (TTS) Röstdata (inspelat) GPX-data -POI-data +Intressepunktsdata TTS-röst Ny sökning Välj textstorlek för namn på kartan @@ -588,7 +588,7 @@ Transporter Indexerar adresser … Indexerar kartan … -Indexerar POI … +Indexerar Intressepunkter … Indexerar transport … Ett I/O-fel har inträffat km @@ -705,7 +705,7 @@ Offline vektorkartor Sök transport vid stopp Plats:\n Lat %1$.5f\n Long %2$.5f - Ändra POI + Ändra Intressepunkt Ta bort POI Till kompass I körriktningen @@ -731,10 +731,10 @@ Favoriter OSM-buggar Hållplatser - POI … + Intressepunkt … Kartkälla … Kartlager - Sök POI + Sök intressepunkt Använd styrkulan för att flytta kartan Använd styrkula @@ -815,7 +815,7 @@ Fel vid laddning av data från servern Inga offline POI-data tillgängliga för detta område Det går inte att uppdatera POI för små zoomnivåer - Uppdatera POI + Uppdatera intressepunkt Uppdatera lokala data via Internet? Stad: {0} Gata: {0},{1} @@ -860,7 +860,7 @@ Välj en destination först Visa GPS-status Öppettider - Laddar POI … + Laddar intressepunkt … Laddar gator/byggnader … Laddar postnummer … Laddar gator … @@ -1060,7 +1060,7 @@ Aktivera 3D-vy på kartan 3D-vy på kartan Visa POI över karta (använd det senast valda filtret) - Visa POI + Visa intressepunkt Välj källa för onlinekartor eller cachade kartbitar Källa för kartbitar Kartkälla @@ -1076,7 +1076,7 @@ Mina platser Sök Sök - Välj POI + Välj intressepunkt Sök efter fler Välj region från lista Välj korsande gata From fe8320817c4b53531b2c52798cdec334384296e7 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 17:00:22 +0100 Subject: [PATCH 159/372] try setListAdapter in onResume() --- .../src/net/osmand/plus/activities/FavouritesListFragment.java | 1 + OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java index b0d1f70c1c..1c48313ef9 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java @@ -86,6 +86,7 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear } } locationUpdate(location); + setListAdapter(favouritesAdapter); } @Override diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index f0045ab4ad..d07fa0ac4b 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -155,7 +155,6 @@ public class DashFavoritesFragment extends DashBaseFragment { favorites.addView(view); } updateLocation(location); - mainView.invalidate(); } private void updateArrows() { From d1bb18b5511687f77a8a75a2294dcb0d1921e062 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Sat, 3 Jan 2015 16:55:40 +0100 Subject: [PATCH 160/372] Translated using Weblate (French) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-fr/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 17cda20090..65490e07ad 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -359,7 +359,7 @@ m Le format obsolète de la carte \'\'{0}\'\' n\'\'est pas supporté Pour conducteurs - Tous les Points d\'Intérêt les plus proches + Points d\'Intérêt les plus proches Filtre personnalisé Alimentation Pour voyageurs @@ -422,8 +422,8 @@ Position inconnue Télécharger Chercher un transport public - Arrêts à proximité (aucune destination définie) : - Arrêts à proximité ({0} de la destination) : + Transports possibles (aucune destination définie) : + Transports possibles ({0} pour rejoindre la destination) : aucun Réinitialiser la recherche de transport Carte @@ -534,7 +534,7 @@ parcourir ensuite parcourir au préalable nombre d\'arrêts : - Distance du trajet : + Distance de l\'itinéraire : Transport OK Afficher les arrêts de transport publics sur la carte From 893aec15d80310a2c27db661831021a0e2b3a776 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 17:27:49 +0100 Subject: [PATCH 161/372] remove setListAdapter, it did not fix the "list is empty after using the BACK key" issue either --- .../src/net/osmand/plus/activities/FavouritesListFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java index 1c48313ef9..b0d1f70c1c 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesListFragment.java @@ -86,7 +86,6 @@ public class FavouritesListFragment extends SherlockListFragment implements Sear } } locationUpdate(location); - setListAdapter(favouritesAdapter); } @Override From b097a047e9b6ff59bba31ab758de7503c2d37f7f Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Sat, 3 Jan 2015 17:27:42 +0100 Subject: [PATCH 162/372] Translated using Weblate (Polish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-pl/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 334bc3b8ae..4c193b32e6 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -324,9 +324,9 @@ Nie rozciągaj i rozmazuj kafelków mapy na ekranach o dużej rozdzielczości Pozycja nie jest jeszcze znana Pobierz - Wyszukaj komunikację - Rezultat wyszukiwania komunikacji (brak celu): - Rezultat wyszukiwania komunikacji ({0} do celu): + Wyszukaj transport publiczny + Rezultat wyszukiwania transportu (brak celu): + Rezultat wyszukiwania transportu ({0} do celu): Żaden Resetuj wyszukiwanie transportu Mapa @@ -416,7 +416,7 @@ Prosto Kontynuuj Pobierz region - Dziękujemy za korzystanie z OsmAnd. Do wykorzystania większości funkcji aplikacji potrzebujesz danych o wybranym regionie, które pobierzesz w \'Ustawienia\' → \'Zarządzaniu plikami map\'. Dzięki nim będziesz mógł przeglądać mapy, wyszukiwać adresy, POI i inne obiekty. + Dziękujemy za korzystanie z OsmAnd. Do wykorzystania większości funkcji aplikacji potrzebujesz danych o wybranym regionie, które pobierzesz w \'Ustawienia\' → \'Zarządzaniu plikami map\'. Dzięki nim będziesz mógł przeglądać mapy, wyszukiwać adresy, POI i transport publiczny. Wyszukiwanie sygnału… Szukaj w pobliżu ostatniej pozycji Szukaj w pobliżu From 36423dfc7326706d70c77f49d7cd29d0eda7cd2d Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 18:08:13 +0100 Subject: [PATCH 163/372] display "Origin: Last map view" in search header when approriate --- .../src/net/osmand/plus/activities/search/SearchActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index 28bd34a9c4..34dce7cde7 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -177,7 +177,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon last = settings.getLastKnownMapLocation(); if(!Algorithms.objectEquals(reqSearchPoint, last)){ reqSearchPoint = last; - updateSearchPoint(last, getString(R.string.select_search_position), true); + updateSearchPoint(last, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); } } } @@ -239,7 +239,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo searchAroundCurrentLocation = false; endSearchCurrentLocation(); if (position == POSITION_LAST_MAP_VIEW) { - updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " ", true); + updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); } else if (position == POSITION_FAVORITES) { Intent intent = new Intent(SearchActivity.this, FavouritesListActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); From c41deae6b3f1793861fb2aa53e1f809391124d76 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 18:21:04 +0100 Subject: [PATCH 164/372] better wording for 2 strings --- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 1997b6cf1c..1d3cc64118 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -613,7 +613,7 @@ Favorit… Undefiniert Aktueller Standort… - Letzte Kartenposition + Aktuelle Kartenposition Ausgangspunkt: In der Nähe suchen Route als GPX-Track speichern diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 73f1c0e6a7..0ee90a6ae4 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1475,7 +1475,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Favorites… Undefined Current position… - Last map view + Current map view Origin: Search near here Recent changes for 0.6.7: @@ -1810,7 +1810,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Later Download regions Searching for signal… - Search near last map location + Search near current map location Search nearby Same as device Portrait From 592e997000b58ab7368c93d2856ce11b9f495463 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sat, 3 Jan 2015 18:21:12 +0100 Subject: [PATCH 165/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-be/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 3f404b66b3..4410b4e3c6 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -593,7 +593,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Пошук цікавосткаў (POI) Пошук па адрасе Каардынаты - Пошук транспарту + Пошук грамадзкага транспарту Пошук упадабаных Гісторыя пошуку Аўтаномная навігацыя OsmAnd часова недаступная. @@ -883,7 +883,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Вызначана Бягучае месцазнаходжаньне… Апошні выгляд мапы - Шукаць блізу: + Пачатак: Шукаць навокал Захаваць шлях як GPX сьлед Маршрут пасьпяхова захаваны як \'%1$s\'. @@ -958,7 +958,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Развярнуць кірунак GPX Выкарыстоўваць бягучы пункт прызначэньня Прайсьці ўвесь шлях спачатку - Для гэтай пазіцыі даступныя лакальныя вектарныя мапы.\n\t\n\tДля іх выкарыстаньня абярыце пункт меню \'Налада мапы\' → \'Крыніца мапы...\' → \'Лакальныя вектарныя мапы\'. + Для гэтага рэгіёну даступныя лякальныя вэктарныя мапы.\n\t\n\tДля іх выкарыстаньня абярыце пункт мэню \'Налада мапы\' → \'Крыніца мапы...\' → \'Лякальныя вэктарныя мапы\'. Вывад галасавых падказак Абярыце канал прайграваньня галасавых падказак Канал телефанаваньня @@ -1505,7 +1505,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Вылічыць сегмент маршруту OsmAnd без Інтэрнэту Вылічыць маршрут OsmAnd для першага і апошняга ўчастка маршруту Ці хочаце вы выкарыстоўваць адлюстраваны сьлед для навігацыі? - Выбраць на мапе … + Выбраць на мапе… Інфармацыя пра маршрут Аддаваць перавагу аўтамагістралям Самы кароткі шлях @@ -1521,9 +1521,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Абмежаваньне вагі Задайце вагу аўтамабіля для пракладаньня маршрутаў Вы хочаце каб OsmAnd таксама скапіяваў свае зьвесткі ў новае месца? Абярыце \"Не\" каб OsmAnd проста стварыў і выкарыстоўваў новы каталёг. - Капіраваньне файла (%s) у новае месца... - Капіяваньне дадзеных OsmAnd у новае месца (%s) - Капіяваньне дадзеных OsmAnd + Капіраваньне файла (%s) у новае месца… + Капіяваньне дадзеных OsmAnd у новае месца (%s)… + Капіяваньне дадзеных OsmAnd… Грузавік Задайце хуткасць вымаўленьня для TTS Хуткасьць вымаўленьня @@ -1542,7 +1542,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Запомніць мой выбар Сусьветная аглядная мапа Сусьветная лыжная мапа - Выбраць GPX … + Абраць GPX … Аддаваць перавагу аўтамагістралям Імітацыя з выкарыстаньнем разлічанага маршруту Імітацыя з выкарыстаньнем GPX-сьледу @@ -1552,7 +1552,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Bitcoin плацяжы ўсяго сьвету Дадаць пунктам прызначэньня Выбраць месца прызначэньня - Упадабаныя .… + Упадабаныя… Настройкі маршрута Разьлічыць пазасеціўны маршрут OsmAnd Навігацыйныя настройкі @@ -1683,7 +1683,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Персанальны ID трэкера Націсніце, каб паглядзець ці падзяліцца ідэнтыфікатарам трэкера.          Выкарыстаньне ідэнтыфікатара трэкера звязанага з прыстасаваньнем дасць магчымасць кантраляваць усе перамяшчэньні гэтага прыстасаваньня! Для адключэньня выберыце опцыю перастварэньня. Токен сесіі: %1$s - У чаканьні дазволу... + У чаканьні дазволу… "Месцазнаходжаньне адаслана %1$d (у буферы %2$d) " Злучэньне ўстаноўлена: %1$s Пачаць OsMo сэсію паўторна @@ -1783,7 +1783,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Інтэрвал нарэзкі выбрана Пад’ём/спад: %1$s - Загрузка %1$s… + Чытаньне %1$s… Бягучы час Пункт шляху \n\nНацісьніце і ўтрымлівайце, каб убачыць на мапе @@ -1879,7 +1879,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Ровар Пешаход Спампаваць мапы, што адсутнічаюць, %1$s (%2$d МБ)? - Больш... + Больш… Усе Кропкі шляху Дарожныя папярэджаньні From 3a58823c56b6b2a9a291e33ca1b9ed889b7e371d Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Sat, 3 Jan 2015 18:11:48 +0100 Subject: [PATCH 166/372] Translated using Weblate (Greek) Currently translated at 93.5% (1491 of 1594 strings) --- OsmAnd/res/values-el/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index d013ae755e..96894f7a5b 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -657,7 +657,7 @@ χλμ/ω μ Παρωχημένη μορφή δεδομένων χάρτη \'\'{0}\'\' δεν υποστηρίζεται - Πλησιέστερο ΣΕ + Πλησιέστερα ΣΕ Προσαρμοσμένο φίλτρο Online NameFinder Ανάγνωση αποθηκευμένων πλακιδίων… From 0e905130eda0897b724db36cbedd7e5a0c217848 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 18:28:53 +0100 Subject: [PATCH 167/372] better wording still after more discussion ... :-) --- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 1d3cc64118..b15b32c73c 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -613,7 +613,7 @@ Favorit… Undefiniert Aktueller Standort… - Aktuelle Kartenposition + Aktueller Kartenmittelpunkt Ausgangspunkt: In der Nähe suchen Route als GPX-Track speichern diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 0ee90a6ae4..dceea014ca 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1475,7 +1475,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Favorites… Undefined Current position… - Current map view + Current map center Origin: Search near here Recent changes for 0.6.7: @@ -1810,7 +1810,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Later Download regions Searching for signal… - Search near current map location + Search near current map center Search nearby Same as device Portrait From e7eb28c7454cd928c769dd8976ea0dab0b5adacc Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sat, 3 Jan 2015 18:28:29 +0100 Subject: [PATCH 168/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-be/strings.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 4410b4e3c6..bd4943da8e 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -882,7 +882,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Нявызначана Вызначана Бягучае месцазнаходжаньне… - Апошні выгляд мапы + Бягучы выгляд мапы Пачатак: Шукаць навокал Захаваць шлях як GPX сьлед @@ -925,7 +925,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Зладаваць Зьвесткі цікавосткаў Адрас - Транспартныя дадзеныя + Зьвесткi грамадзкага транспарту Дадзеныя мапы Не актыўны Галасавыя зьвесткі (TTS) @@ -1056,7 +1056,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві км/г м Састарэлы фармат дадзеных мапы \'\'{0}\'\' не падтрымліваецца - Бліжэйшыя цікавосткі + Бліжэйшыя POI Свой фільтар Сеткавы NameFinder Чытаньне кэшаваных растравых мапаў… @@ -1110,9 +1110,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Дысплей высокай рэзалюцыі Не расьцягваць (з размыццём) растравыя мапы на дысплеях з высокай шчыльнасьцю Зладаваць - Пошук транспарту - Пошук транспарту (няма цэлі): - Пошук транспарту ({0} да цэлі): + Шукаць грамадзкi транспарт + Вынiк пошуку транспарту (няма цэлі): + Вынiк пошуку транспарту ({0} да цэлі): няма Шукаць транспарт зноў Мапа @@ -1123,7 +1123,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві GPX сьлед… Памылка пры чытаньні GPX дадзеных Лакальныя вектарныя мапы - Пошук транспарту на прыпынку + Шукаць транспарт на прыпынку Месца:\n %1$.5f шыр.\n %2$.5f даў. Памылка Зьмяніць цікавостку @@ -1145,7 +1145,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві На SD-карце не знойдзена лакальных дадзеных для рэгіёнаў. Спампаваць рэгіёны з Інтэрнэту. Увядзіце запыт для пошуку POI Усе - Маршрут перавозкі + Маршрут транспарту Дзякуй Яндэксу за дарожную інфармацыю. Яндэкс заторы Маршрут @@ -1199,7 +1199,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Далей Зладаваць рэгіёны Пошук сігналу… - Пошук побач з апошнім месцам на мапе + Шукаць побач з бягучым месцам на мапе Шукаць паблізу Па змаўчаньні Вэртыкальная @@ -1211,7 +1211,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Маршруты Прыпынак прыпынкаў - Наступны маршрут + Далейшы маршрут Папярэдні маршрут Скончыць пошук Выберыце прыпынак для сходу @@ -1221,7 +1221,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Даўжыня маршруту Транспарт Добра - Паказаць прыпынкі грамадскага транспарту на мапе + Паказаць прыпынкі грамадзкага транспарту на мапе Паказваць прыпынкі транспарту Навігацыйная праграма OsmAnd Дадзеныя POI былі пасьпяхова абноўленыя ({0} аб\'ектаў загружана) From b48207dee82a3bd90d2338ddd33bcd914fad2581 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sat, 3 Jan 2015 18:26:50 +0100 Subject: [PATCH 169/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 7b48f343ba..fb779c2b34 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -293,7 +293,7 @@ És necessària per a les trameses a openstreetmap.org El fitxer de dades de PDI «%1$s» és redundant i serà suprimit. Preferits… -Darrera visualització del mapa +Visualització actual del mapa Cerca prop de: Desa les indicacions Pengeu els fitxers GPX a la comunitat d\'OSM. Es faran servir per millorar els mapes. From c328aef0957f5a761fd69d9f03c14edfda21e17d Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sat, 3 Jan 2015 18:31:33 +0100 Subject: [PATCH 170/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ca/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index fb779c2b34..c784cf6810 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -293,7 +293,7 @@ És necessària per a les trameses a openstreetmap.org El fitxer de dades de PDI «%1$s» és redundant i serà suprimit. Preferits… -Visualització actual del mapa +Centre del mapa actual Cerca prop de: Desa les indicacions Pengeu els fitxers GPX a la comunitat d\'OSM. Es faran servir per millorar els mapes. @@ -885,7 +885,7 @@ Gireu fortamanent a l\'esquerra i continueu Gireu lleugerament a l\'esquerra i continueu Feu un gir en forma d\'U i continueu - Cerca la darrera localització propera al mapa + Cerca propera a la posició actual al mapa Parada Itinerari subsegüent Finalitza la cerca From dcf767479807aa4d6017695145dbb7dbf4597cf8 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 18:58:37 +0100 Subject: [PATCH 171/372] fix correct "Current map center" getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view) init if called from the map screen --- .../net/osmand/plus/activities/search/SearchActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index 34dce7cde7..a4142d54da 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -169,7 +169,11 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); + if (!Algorithms.objectEquals (reqSearchPoint, settings.getLastKnownMapLocation()) { + updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); + } else { + updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); + } } } } From 3668ef70a5a3c5ce35c1992774a47613bde6a522 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sat, 3 Jan 2015 18:56:00 +0100 Subject: [PATCH 172/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-be/strings.xml | 56 +++++++++++++++----------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index bd4943da8e..98588ca08d 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -93,7 +93,7 @@ Прамежкавыя кропкі шляху адсартаваныя аптымальным чынам ад пачатковай да канчатковай. Упарадкаваць па адлегласьці Файл зьмен OSM пасьпяхова створаны ў %1$s - Збой рэзервовага капіяванья файлу зьмяненьняў OSM + Збой рэзервовага капіяваньня файлу зьмен OSM Рэзервовае капіяваньне файлу зьмен OSM Выдаліць кропку час @@ -138,7 +138,7 @@ Дазволіць адсочваньне месцазнаходжаньня і навігацыю ў рэжыме сну (калі экран выключаны) шляхам пэрыядычнага абуджэньня GPS прыймача. Паказаць налады запісу вандровак ў лякальныя GPX файлы ці ў сеткавы вэб-сэрвіс. Запіс сьледу - Налады ўключэньня запісу сьледу і навігацыі ў рэжыме сну (экран выключаны) шляхам перыядычнага абуджэньня GPS прыймача. + Налады ўключэньня запісу сьледу і навігацыі ў фонавым рэжыме (экран выключаны) шляхам пэрыядычнага абуджэньня GPS прыймача. Усталяваньне версіі Абраць выгляд праграмы Выгляд @@ -261,13 +261,12 @@ Працаваць у бясьпечным рэжыме (трохі павольней але бяз свойскіх бібліятэк). Бясьпечны рэжым Праграма працуе ў бясьпечным рэжыме (адключыць яго ў наладах). - Сьпячы рэжым OsmAnd па-ранейшаму працуе. Хочаце прыпыніць яго? - Змены ў версіі 1.0.0: - \n\t* Палепшана маршрутызацыя: хутчэй, дакладней, да 250 км - \n\t* Уведзены карты дарог - \n\t* Карта не губляе прывязкі да пазіцыі пасля перарыванняў - \n\t* Уключана служба рэжыма сну падчас навігацыі - + Фонавы рэжым OsmAnd па-ранейшаму працуе. Хочаце прыпыніць яго? + "Змены ў версіі 1.0.0: +\n\t* Палепшана маршрутызацыя: хутчэй, дакладней, да 250 км +\n\t* Уведзены карты дарог +\n\t* Карта не губляе прывязкі да пазіцыі пасля перарыванняў +\n\t* Уключана служба фонавага рэжыму падчас навігацыі " Зачыніць мноства зьмен Праграма ZXing Barcode Scanner не ўстаноўлена. Шукаць у Market? Выберыце схему колераў дарог: @@ -496,8 +495,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Празрыстае афармленьне - Ўключыць\n спячы рэжым - Спынiць\n рэжым сну + Уключыць\n фонавы рэжым + Спынiць\n фонавы рэжым Iнтэрвал абуджэньня GPS: %s Безперапынны Для разблакоўкі экрана дакраніцеся да значка блакаваньня @@ -1160,19 +1159,19 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Выкарыстоўвайце трэкбол Задаць максімальны час чаканьня для кожнага фонавага вызначэньня каардынатаў Максімальны час чаканьня вызначэньня каардынат - Выключыць навігацыю OsmAnd для рэжыму сну + Выключыць фонавы рэжым навігацыі OsmAnd Дзе я? Навігацыйны сэрвіс OsmAnd Сетка GPS сэкундаў хв. - Абярыце інтэрвал абуджэньня для спячага рэжыму + Абярыце інтэрвал абуджэньня для фонавага рэжыму Інтэрвал абуджэньня GPS - Абярыце крыніцу каардынат для выкарыстаньня падчас спячага рэжыму + Абярыце крыніцу каардынат для выкарыстаньня фонавым сэрвісам Крыніца каардынат Запускае OsmAnd ў фонавым рэжыме для адсочвання месцазнаходжаньня пры выключаным экране - Працаваць ў рэжыме сну + Працаваць ў фонавым рэжыме Фонаваму сэрвісу неабходная інфармацыя пра месцазнаходжаньне. Схаваць фільтр Паказаць фільтр @@ -1314,7 +1313,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Налады Захаваць бягучы сьлед на SD зараз Захаваць бягучы GPX сьлед - Інтэрвал захоўванья падчас навігацыі + Інтэрвал захоўваньня падчас навігацыі Пазначыць інтэрвал захоўваньня пунктаў сьледу падчас навігацыі Сьляды будуць захаваныя ў каталог track падчас навігацыі Запісваць сьлед у GPX файл @@ -1407,7 +1406,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Імя аўтара Даданьне каментара да памылкі Дадаць камэнтар - Гэты каментар быў пасьпяхова дададзены + Гэты камэнтар быў пасьпяхова дададзены Выключная сітуацыя: каментар не быў дададзены Зачыніць памылку Закрыцьцё памылкі @@ -1609,11 +1608,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\t* \'Турыстычны\' варыянт стылю мапы з большай колькасьцю дэталяў, новымі стылямі дарог, павышанай кантрастнасцю і інш. \n\t* Карэкцыя геоіду EGM96 для паказанняў вышыні GPS - Змены ў 0.8.4: - \n\t* Выпраўленне памылак - \n\t* Карта не губляе блакавання пазіцыі пасля перапыненняў - \n\t* Уключае рэжым сну падчас навігацыі - + "Змены ў 0.8.4: +\n\t* Выпраўленне памылак +\n\t* Карта не губляе блакавання пазіцыі пасля перапыненняў +\n\t* Уключае фонавы рэжым падчас навігацыі " Гэты модуль паказвае ізалініі вышынь на картах OsmAnd. Глабальныя дадзеныя (паміж 70 градусамі на поўначы і 70 градусамі на поўдні) грунтуюцца на вымярэннях SRTM (Shuttle Radar Topography Mission) і ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), дадзеных інструмента візуалізацыі Terra, флагманскага спадарожніка сістэмы назірання Зямлі ад NASA. ASTER - гэта вынік сумеснай працы NASA, міністэрства эканомікі Японіі, міністэрства гандлю і прамысловасці Японіі (METI), агенцтва касмічных сістэм Японіі (J-spacesystems). Модуль дазваляе загружаць дадзеныя ізаліній вышынь (\'Налады\' → \'Кіраваньне файламі мапаў\' → \'Спампаваць\' → Выберыце пажаданы тып карты). Модуль OsMoDroid - пашырэньне для OsmAnd, што выкарыстоўвае праграму OsModroid для сеткавага адсочваньня. Інфармацыю аб сэрвісе можна знайсьці на сайце http://esya.ru. @@ -1628,7 +1626,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\t* Кнопка блакавання экрана ў службе абсочваньня↵ \n\t* Выпраўлена напісанне арабскаю, моваю каннада і мовамі, якія маюць пісьменнасць справа налева - Як хутка вы хочаце чуць паведамленье пра прыбыцьцё? + Як хутка вы хочаце чуць паведамленьне пра прыбыцьцё? "Актуальныя картаграфічныя дадзеныя вельмі важныя для аўтаномнага прагляду мапы і адраснага пошуку. OsmAnd мае ўбудаваны мэнэджэр файлаў мапаў, які можа правяраць наяўнасць абнаўленьняў для лакальных мапаў. \n\nКаб выканаць загрузку мапаў абярыце пункт меню \'Налады\' → \'Кіраваньне файламі мапаў\' → \'Загрузка\'. ↵ \n\nПасля таго як сьпіс рэгіёнаў будзе загружаны зь Інтэрнэту, націсьніце на любы пункт для загрузкі або абнаўленьня файла. Звярніце ўвагу, селектар тыпу файла знаходзіцца ў верхняй частцы экрана, каб выбраць патрэбны тып файлаў для загрузкі (карты, слаі рэльефу і г.д.) ↵ @@ -1724,7 +1722,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Інтэрвал адсылкі дадзеных Тэрмін дзеяньня скончыцца праз Хуткі доступ OsMo - Сесія не даступная, калі ласка, пераканайцеся, што пункт \'Адсылаць месцазнаходжаньне\' уключаны. + Сэсыя не даступная, калі ласка, пераканайцеся, што пункт \'Адсылаць месцазнаходжаньне\' уключаны. Каб падключыцца да патрэбнага прыстасаваньня %2$s націсьніце на спасылку %3$s альбо задайце ідэнтыфікатар трэкеру (%1$s) чырвоны ружовы @@ -1829,14 +1827,14 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Адлюстроўваць тып пакрыцьця Паказаць веламаршруты Прыпыніць - Уключыць рэжым сну GPS + Уключыць фонавы рэжым GPS Iнтэрвал абуджэньня GPS суахілі іўрыт Пачаць запіс GPX Пачаць новы адрэзак пэрсійдзкая - Прыпыніць рэжым сну GPS? + Прыпыніць фонавы рэжым GPS? Пажаданая мова надпісаў на мапе (калі не даступна, то будуць выкарыстны ангельскія ці мясцовыя назвы) Пажаданая мова мапы Мясцовыя назвы @@ -1847,7 +1845,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Пачаць адсочваньне праз Інтэрнэт Спыніць адсочваньне праз Інтэрнэт Адсочваньне праз Інтэрнэт (патрабуецца GPX) - Адсылаць месцазнаходжаньне на пазначаны вэб сэрвіс пры ўключаным запісе GPX. + Адсылаць месцазнаходжаньне на пазначаны вэб-сэрвіс пры ўключаным запісе GPX. альбанская арабская сэрбская @@ -1898,8 +1896,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Інтэрвал запісу Агульны запіс месцазнаходжаньня ў GPX файл можа быць уключаны або выключаны з дапамогай кнопкі запісу GPX на экране з мапай Пытацца заўсёды - Выберыце інтэрвал рэгістраваньня для запісвання агульнага шляху (уключаецца віджэтам запісу GPX на мапе) - Агульны інтэрвал запісваньня + Абярыце інтэрвал запісу сьледу (уключаецца віджэтам запісу GPX на мапе) + Агульны інтэрвал запісу Абмежаваньне хуткасьці Памежны кантроль Платны праезд From 1462adb2092de739889641a3ae47beea26e612bb Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 19:05:14 +0100 Subject: [PATCH 173/372] fix build --- .../src/net/osmand/plus/activities/search/SearchActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index a4142d54da..4f0709acab 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -169,7 +169,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - if (!Algorithms.objectEquals (reqSearchPoint, settings.getLastKnownMapLocation()) { + if (!Algorithms.objectEquals (reqSearchPoint, settings.getLastKnownMapLocation())) { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); } else { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); From 13dec51e1b7c3f4c9157fec7a5d7f6c96fec9d98 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sat, 3 Jan 2015 19:05:11 +0100 Subject: [PATCH 174/372] Translated using Weblate (Danish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index dd74320e28..3813c0d8da 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -553,7 +553,7 @@ Ikke defineret " " Aktuel position… - Seneste kortvisning + Nuværende kortcenter Udgangspunkt: Søg i nærheden Gem rute som GPX-spor From 053fe8bc955597d10c172393ed0289d9205cd321 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 19:39:44 +0100 Subject: [PATCH 175/372] fix small issue --- .../src/net/osmand/plus/activities/search/SearchActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index 4f0709acab..3610bd7a29 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -169,7 +169,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - if (!Algorithms.objectEquals (reqSearchPoint, settings.getLastKnownMapLocation())) { + if (reqSearchPoint == settings.getLastKnownMapLocation()) { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); } else { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); From 29e6361cf87495f250f8adb4c29c3cf9466f0e1f Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sat, 3 Jan 2015 19:14:19 +0100 Subject: [PATCH 176/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-be/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 98588ca08d..e40a6e5515 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -881,7 +881,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Нявызначана Вызначана Бягучае месцазнаходжаньне… - Бягучы выгляд мапы + Бягучы цэнтар мапы Пачатак: Шукаць навокал Захаваць шлях як GPX сьлед @@ -1198,7 +1198,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Далей Зладаваць рэгіёны Пошук сігналу… - Шукаць побач з бягучым месцам на мапе + Шукаць побач з бягучым цэнтрам мапы Шукаць паблізу Па змаўчаньні Вэртыкальная @@ -1976,8 +1976,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Галасавыя падказкі Аранжавы Нямецкі атлас аўтадарог - Амерыканскі атлас аўтадарог - Без правілаў маршрутызацыі v1.9 + Амэрыканскі атлас аўтадарог + Бяз правілаў маршрутызацыі v1.9 Не выкарыстоўваць правілы маршрутызацыі ўведзеныя ў v1.9 Па змоўчаньні Стыль аўтадарог From 1f6e077effa7d6f8df52655fcfdc5eb31ccdb538 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sat, 3 Jan 2015 19:13:15 +0100 Subject: [PATCH 177/372] Translated using Weblate (Danish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-da/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 3813c0d8da..0344456fb1 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1005,7 +1005,7 @@ Senere Hent regioner Søger efter signal… - Søg tæt på sidste kortplacering + Søg i nærheden af nuværende kortcenter Søg i nærheden Samme som enhed Stående @@ -1014,12 +1014,12 @@ Stående, liggende eller som enhed Tilføj ny regel Ruter - Efterfølgende rejseplan - Forudgående rejseplan + Efterfølgende ruteplan + Forudgående ruteplan Afslut søgning tidligere afstand efterfølgende afstand - Rejseplan afstand + Ruteplan længde Transport Nej Ja From f93e2035ae5c22ae7adf19c36b41313fe0762151 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 19:57:00 +0100 Subject: [PATCH 178/372] revert last change --- .../src/net/osmand/plus/activities/search/SearchActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index 3610bd7a29..d70245c37f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -169,7 +169,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - if (reqSearchPoint == settings.getLastKnownMapLocation()) { + if (Algorithms.objectEquals(reqSearchPoint, settings.getLastKnownMapLocation())) { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); } else { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); From 8aa97a1eef7cebe65fb0d0203fed3517f2012bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Sat, 3 Jan 2015 19:42:47 +0100 Subject: [PATCH 179/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-hu/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 7acfd6c0a0..25215f4f05 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -212,7 +212,7 @@ Meghatározatlan Jelenlegi pozíció… - Utolsó térképnézet + Jelenlegi térkép középpont Eredet: Keresés itt 0.6.7 verzió változásai: \n\t- Offline - kapcsolat nélküli - adat kezelés (letöltés, törlés, aktiválás/deaktiválás közvetlenül az OsmAndban) \n\t- Kedvenc pontok és csoportok (csoportosítás, törlés, kedvencek kezelése) \n\t- Beépített GPX böngésző (útvonalak megjelenítése, távolság, átlagsebesség, magasság, stb.) \n\t- GPX navigáció (hasznos opciók, összeomlás után útvonal folytatása, körforgalmak kezelése) \n\t- Útvonal mentése GPX útvonalként kapcsolat nélküli munkához \n\t- GPX adatok kibővítése (pontatlan adatok kiszűrése és pontosság/emelkedés/sebesség mentése) \n\t- GPX útvonal feltöltése az OSM közösséghez (http://download.osmand.net/gpx/) \n\t- Vektoros megjelenítés javítása \n\t- TTS javítások (pontos távolság kimondása, mérföld) \n\t- Hibajavítások @@ -414,7 +414,7 @@ m Az elavult térkép formátum \'\'{0}\'\' nem támogatott Autós segítség - Közeli POI + Legközelebbi POI-k Egyéni szűrő Élelmiszer üzlet Turistáknak @@ -567,7 +567,7 @@ Térképadatok letöltése Köszönjük, hogy az OsmAndot használod! Hogy a program minden lehetőségét kihasználhasd, regionális offline adatokra lesz szükséged, amiket a \'Beállítások\' → \'Térképek kezelése\' menüben szerezhetsz be. Ezt követően tudsz majd térképet nézni, címre, POI-ra és tömegközlekedési eszközre keresni. Jel keresése… - Keresés az utolsó térképpozíció közelében + Keresés a jelenlegi térkép középpontja közelében Keresés a közelben Mint a készülék Függőleges From 210cc480936b7bb1c9c7d35547280229b7f2b25b Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Sat, 3 Jan 2015 19:52:20 +0100 Subject: [PATCH 180/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1594 strings) --- OsmAnd/res/values-sv/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 35469516e9..8989ab5eeb 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -431,7 +431,7 @@ Odefinierad Nuvarande position … -Senaste kartvyn +Aktuell kartmitt Ursprung: Sök i närheten Spara rutt som GPX-spår @@ -785,7 +785,7 @@ Senare Ladda ner regioner Söker efter signal … - Sök i närheten av förra platsen på kartan + Sök i närheten av aktuell kartmitt Sök i närheten Samma som enheten Stående From 4d932f70e6b18b6e13fffeeed86c04a0379a6342 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 21:07:52 +0100 Subject: [PATCH 181/372] try better float-double comparison --- .../net/osmand/plus/activities/search/SearchActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index d70245c37f..c21666fda3 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -162,6 +162,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo Intent intent = getIntent(); OsmandSettings settings = ((OsmandApplication) getApplication()).getSettings(); + LatLon last = settings.getLastKnownMapLocation(); if (intent != null) { double lat = intent.getDoubleExtra(SEARCH_LAT, 0); double lon = intent.getDoubleExtra(SEARCH_LON, 0); @@ -169,7 +170,8 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - if (Algorithms.objectEquals(reqSearchPoint, settings.getLastKnownMapLocation())) { + //if (Algorithms.objectEquals(reqSearchPoint, settings.getLastKnownMapLocation())) { + if ((Math.abs(lat - last.getLatitude()) < 0.00001) && (Math.abs(lon - last.getLongitude()) < 0.00001)) { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); } else { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " ", true); @@ -178,7 +180,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo } } if(searchPoint == null){ - LatLon last = settings.getLastKnownMapLocation(); + //LatLon last = settings.getLastKnownMapLocation(); if(!Algorithms.objectEquals(reqSearchPoint, last)){ reqSearchPoint = last; updateSearchPoint(last, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); From d61d6b725ef1ceb65f310ca2e66a98da73c42b33 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Sat, 3 Jan 2015 20:26:41 +0100 Subject: [PATCH 182/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ca/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index c784cf6810..834666d315 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -368,7 +368,7 @@ S\'estan indexant les adreces-… Indexant el mapa… S\'estan indexant els PDI … -Indexant els transports… +S\'estan indexant els transports… Filtre personalitzat Per a turistes Carburants @@ -523,7 +523,7 @@ iardes mph milles -PDIs més propers +PDI més propers Mostra el lloc web del PDI Telèfon Tipus de filtre From 5024d6994c4b90893b9ae3bf7965cb66eb1eae65 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Sat, 3 Jan 2015 20:41:18 +0100 Subject: [PATCH 183/372] Translated using Weblate (Catalan) Currently translated at 25.0% (153 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 530bcaaf01..fd6972aba3 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -154,4 +154,12 @@ Pont Aspiradores i aparells de neteja + Sortida d\'autopista + + Pou d\'aigua + Drassana + Planta de tractament d\'aigües residuals + Torre d\'aigua + Resclosa + Abocador d\'aigua From 0f1ca3ddad36ac6da8a26219eab4c9ede48e2166 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 21:22:22 +0100 Subject: [PATCH 184/372] clean up comments --- .../src/net/osmand/plus/activities/search/SearchActivity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java index c21666fda3..05e68cafd6 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java @@ -170,7 +170,6 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo LatLon l = new LatLon(lat, lon); if(!Algorithms.objectEquals(reqSearchPoint, l)){ reqSearchPoint = l; - //if (Algorithms.objectEquals(reqSearchPoint, settings.getLastKnownMapLocation())) { if ((Math.abs(lat - last.getLatitude()) < 0.00001) && (Math.abs(lon - last.getLongitude()) < 0.00001)) { updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); } else { @@ -180,7 +179,6 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo } } if(searchPoint == null){ - //LatLon last = settings.getLastKnownMapLocation(); if(!Algorithms.objectEquals(reqSearchPoint, last)){ reqSearchPoint = last; updateSearchPoint(last, getString(R.string.select_search_position) + " " + getString(R.string.search_position_map_view), false); From 4609acc31bcc3f532d7a446f646ae5442472c3fc Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Sat, 3 Jan 2015 21:10:02 +0100 Subject: [PATCH 185/372] Translated using Weblate (Catalan) Currently translated at 25.2% (154 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index fd6972aba3..62ff5a9fa3 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -162,4 +162,5 @@ Torre d\'aigua Resclosa Abocador d\'aigua + Presa d\'aigua From 506e4d18bfb00bc3a314bff9ab92c2830e8c4a73 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 21:38:10 +0100 Subject: [PATCH 186/372] Insert TODO's commtents for the "direction arrows are wrong for rotated display" bug --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 5 +++++ .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 5 +++++ OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 3e60b44f87..bf585e8827 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -777,7 +777,12 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa DirectionDrawable draw = new DirectionDrawable(SearchPOIActivity.this, width, height, false); Float h = heading; float a = h != null ? h : 0; + + //TODO: Hardy: The arrow direction below is correct only for the default display's standard orientation + // i.e. still needs to be corrected for .ROTATION_90/180/170 + // Keep in mind: getRotation was introduced from Android 2.2 draw.setAngle(mes[1] - a + 180); + draw.setOpenedColor(opened); direction.setImageDrawable(draw); } else { diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index d07fa0ac4b..6e104d6e79 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -175,7 +175,12 @@ public class DashFavoritesFragment extends DashBaseFragment { DirectionDrawable draw = new DirectionDrawable(getActivity(), 10, 10, true); Float h = heading; float a = h != null ? h : 0; + + //TODO: Hardy: The arrow direction below is correct only for the default display's standard orientation + // i.e. still needs to be corrected for .ROTATION_90/180/170 + // Keep in mind: getRotation was introduced from Android 2.2 draw.setAngle(mes[1] - a + 180); + direction.setImageDrawable(draw); } diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java index 10f7665bef..f122b4e893 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java @@ -1257,6 +1257,9 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements float[] mes = new float[2]; net.osmand.Location.distanceBetween(location.getLatitude(), location.getLongitude(), mapLocation.getLatitude(), mapLocation.getLongitude(), mes); + //TODO: Hardy: Check: The arrow direction below may only be correct for the default display's standard orientation + // i.e. still needs to be corrected for .ROTATION_90/180/170 + // Keep in mind: getRotation was introduced from Android 2.2 draw.setAngle(mes[1] - lastCompass + 180); long now = System.currentTimeMillis(); final boolean recent = Math.abs( now - location.getTime() ) < RECENT_THRESHOLD; From 39ae2dd666a4fd5bb0812a4b632eedc51c0545d2 Mon Sep 17 00:00:00 2001 From: Lu Ca Date: Sat, 3 Jan 2015 21:37:44 +0100 Subject: [PATCH 187/372] Translated using Weblate (Sardinian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-sc/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 9b7aabb130..2b7b7ea64a 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -1148,7 +1148,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres Non dessinidu Positzione currente… - Ùrtima bisura mapa + Tzentru atuale de sa mapa Imbia ad OSM Puntu/os prefèrridu/os burrados. Ses burrande %1$d prefèrridu/os e %2$d grupu/os prefèrridos. Ses seguru? @@ -1431,7 +1431,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres A pustis Iscàrriga sas regiones Chirca sinnale GPS… - Chirca a curtzu de s\'ùrtima positzione in sa mapa + Chirca a curtzu de su tzentru atuale de sa mapa Chirca a curtzu Orientamentu predefinidu Verticale From e4bf2a4ce20aba9196db7eebc174aac902d84189 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Sat, 3 Jan 2015 21:36:46 +0100 Subject: [PATCH 188/372] Translated using Weblate (Catalan) Currently translated at 25.3% (155 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 62ff5a9fa3..a8909851a2 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -163,4 +163,6 @@ Resclosa Abocador d\'aigua Presa d\'aigua + Molí hidràulic + From da63695635130b55190d82075f4176c9865d2dd0 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Sat, 3 Jan 2015 21:38:51 +0100 Subject: [PATCH 189/372] Translated using Weblate (Catalan) Currently translated at 25.5% (156 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index a8909851a2..b999abe872 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -165,4 +165,5 @@ Presa d\'aigua Molí hidràulic + Subestació elèctrica From 350514a3e466f00ca870114461aa6e0f41687007 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 3 Jan 2015 22:05:07 +0100 Subject: [PATCH 190/372] More precise explanation of Kalman filter --- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index b15b32c73c..b80bf431ad 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1415,7 +1415,7 @@ Vollversion Navigation stoppen Route verwerfen - Kalman-Filter verwenden, um Kompass-Ungenauigkeiten auszublenden + Kompass-Rauschreduzierung, erhöht die Kompassträgheit etwas Kalman-Filter verwenden Eingabehilfen-Modus: Bitte zuerst Ziel auswählen Magnetsensor statt Lagesensor zur Kompassermittlung verwenden diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index dceea014ca..c8e1dfdaee 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -624,7 +624,7 @@ Save as GPX Open existing GPX Please wait until current task is finished - Use Kalman filter to avoid compass aberrations + Reduces noise in compass readings but adds inertia Use Kalman filter Accessibility mode: please select destination first Use magnetic sensor to determine compass value instead of orientation sensor From 7a8cf6abb493ba4d1332dad10b7a6a607796ed52 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Sat, 3 Jan 2015 22:03:52 +0100 Subject: [PATCH 191/372] Translated using Weblate (Catalan) Currently translated at 27.0% (165 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index b999abe872..8bd4882fa1 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -166,4 +166,15 @@ Molí hidràulic Subestació elèctrica + Transformador elèctric + Central energètica + Generador d\'energia + + Oficina de correus + Bústia de correus + Telèfon públic + Torre de comunicacions + Central telefònica + + Reciclatge From a6a052b0737e679cb32a26ebfae02c63b155ea2f Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 08:58:30 +0100 Subject: [PATCH 192/372] Try fix issue that DashFavoritesFragment is not reliably shown on non-compass devices --- OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 59ea76be4a..b34d97de28 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -498,6 +498,11 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca if (f instanceof DashAudioVideoNotesFragment && !f.isDetached()) { ((DashAudioVideoNotesFragment) f).setupNotes(); } + + //Needed to reliably initialize DashFavoritesFragement on devices without compass + if (f instanceof DashFavoritesFragment && !f.isDetached()) { + ((DashFavoritesFragment) f).updateLocation(null); + } } } From 1c1e46c95c70aa21a47f09e265a60b419c02b4cc Mon Sep 17 00:00:00 2001 From: jan madsen Date: Sat, 3 Jan 2015 22:30:40 +0100 Subject: [PATCH 193/372] Translated using Weblate (Danish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 0344456fb1..e086a407e5 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1279,7 +1279,7 @@ Magnetisk sensor Højdekurvedata Brug magnetisksensor i stedet for retningssensor til at bestemme kompasværdi - Brug Kalman-filter for at undgå kompasmisvisning + Reducerer støj i kompasaflæsninger, men tilføjer inerti Kalman filter Tilgængelighedstilstand: Vælg destination først Vent - mens aktuel opgave bliver færdig From 7ac4d501531a1e360d796e88913cc03ce5d52400 Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Sun, 4 Jan 2015 07:20:53 +0100 Subject: [PATCH 194/372] Translated using Weblate (Greek) Currently translated at 94.1% (1501 of 1594 strings) --- OsmAnd/res/values-el/strings.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 96894f7a5b..cda61b8913 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -454,7 +454,7 @@ Ακαθόριστο Τρέχουσα θέση… - Τελευταία οπτική χάρτη + Τρέχον κέντρο χάρτη Πηγή: Αναζήτηση εδώ κοντά "Πρόσφατες αλλαγές στην 0.6.7 : @@ -805,7 +805,7 @@ Αργότερα Λήψη περιοχών Αναζήτηση σήματος… - Αναζήτηση κοντά στην τελευταία τοποθεσία του χάρτη + Αναζήτηση κοντά στο τρέχον κέντρο του χάρτη Αναζήτηση στη γύρω περιοχή Το ίδιο με τη συσκευή Πορτραίτο @@ -1233,7 +1233,7 @@ Πλήρης έκδοση Χρήση του μαγνητικού αισθητήρα Χρήση του μαγνητικού αισθητήρα για τον προσδιορισμό της ένδειξης της πυξίδας, αντί του αισθητήρα προσανατολισμού - Χρήση φίλτρου Kalman για αποφυγή απόκλισης της πυξίδας + Μειώνει τον θόρυβο στην ανάγνωση της πυξίδας αλλά προσθέτει αδράνεια Χρήση φίλτρου Kalman Λειτουργία προσβασιμότητας: παρακαλώ επιλέξτε πρώτα προορισμό Παρακαλώ περιμένετε μέχρι να τελειώσει η τρέχουσα διεργασία @@ -1686,4 +1686,14 @@ Εναπομείναντα στοιχεία Επιλέξτε το περιθώριο του ορίου ταχύτητας, πάνω από το οποίο θα ακούτε ηχητική προειδοποίηση. Αλλάχτηκε το όνομα του αγαπημένου σημείου σε %1$s για να αποφευχθούν διπλά ονόματα. - + Γερμανικός άτλαντας δρόμων + Αμερικάνικος άτλαντας δρόμων + Χρήση αποτύπωσης OpenGL + Χρήση αποτύπωσης με επιτάχυνση υλικού OpenGL (μπορεί να μη λειτουργεί σε ορισμένες συσκευές) + Άναμμα της οθόνης όταν πλησιάζετε μια στροφή + Προειδοποίηση κυκλοφοριακού + Γενικό διάστημα καταγραφής + Θέλετε να χρησιμοποιήσετε το εμφανιζόμενο ίχνος για πλοήγηση; + Προορισμός + Φωνητικές οδηγίες + From 1bffcd95b83f4ad7d31acb6fa12676db45c2ef44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Sun, 4 Jan 2015 03:03:53 +0100 Subject: [PATCH 195/372] Translated using Weblate (Korean) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ko/strings.xml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 1aeeeae95e..ed94029850 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -234,7 +234,7 @@ 정의되지 않음 고정 현재 위치… - 마지막 지도 보기 + 현재 지도 센터링 원점 : 가까운 주변 검색 @@ -461,7 +461,7 @@ m 사용되지 않은 지도 데이터 형식 \'\'{0}\'\' 은 지원되지 않습니다 주유소 - 가장 가까운 POI + 가까운 POI 사용자 필터 식품가게 여행자 @@ -628,7 +628,7 @@ "OsmAnd 를 선택해 주셔서 감사합니다. 앱의 모든 기능을 사용하려면, 인덱스 파일을 (설정->지도 관리) 다운로드 하여 준비하세요. \n그런 다음, 지도를 보거나 주소, POI, 공공장소 등등을 찾을 수 있습니다." 신호 위치 찾는 중… - 지난번 지도 위치 검색 + 현재 지도 센터링 검색 근처 검색 장치와 같음 세로 @@ -801,7 +801,7 @@ 빌딩 검색 목록에서 지역을 선택합니다 교차로를 선택합니다 -가장 가까운 시설들 +근접한 시설들 지도 찾아보기 자동차 자전거 @@ -1042,7 +1042,7 @@ 나머지 요소 : %1$d OSM 변경 사항을 삭제하려고 합니다. 확실합니까? OsmAnd 오프라인 라우팅(길찾기)는 200km 이상 떨어진 포인트를 계산할 때 매우 긴 시간이 걸리 수 있습니다. (가끔 작동 되지 않을 수 있습니다) 당신은 더 나은 성능을 위해 경유지를 추가할 수 있습니다. - 가까운 거리에 + 좀 더 가깝게 중간 거리에 긴 거리에 타원 메르카토르 @@ -1755,15 +1755,14 @@ \n\t* \'Light sensor\': map appearance is controlled by the device\'s light sensor (only if equipped) " "표시된 맵 소스와 계층 지도는 [메뉴]->[계층 지도]에서 변경할 수 있다.\n[맵 소스] 아래에.. 미리 로드된 오프라인 벡터 지도를 사용하여 선택할 수 있다. OsmAnd 는 또한 사용자 지도를 지원합니다. " "OsmAnd 는 다른 사용 사례에 대해 서로 다른 (사용자 정의) 앱 프로필을 지원합니다. 지도 화면 (아이콘 자동차, 자전거 또는 보행자 )의 왼쪽 하단 모서리에 있는 프로필 버튼을 통해 프로필을 변경하거나 경로(\'전송 모드\')을 만들 때 할 수 있습니다. " - [위치사용->가까운 장소 검색] 메뉴를 통해서 지도에서 장소를 직접 검색할 수 있습니다. 또는 [메뉴->검색]을 통해서 화면에서 검색할 수 도 있습니다. - \n\n검색화면은 검색을 위한 템플릿을 제공합니다 - \n\t* 주소로 - \n\t* 좌표로 - \n\t* POI로 (by type or by name) - \n\t* 기록된 검색으로 - \n\t* 즐겨찾기로 검색할 수 있습니다. - \n\n컨텍스트 메뉴를 이용하거나 또는 액션 바는 [길안내 또는 지도에서 보기] 등을 제공합니다. - + "[위치사용->주변 장소 검색] 메뉴를 통해서 지도에서 장소를 직접 검색할 수 있습니다. 또는 [메뉴->검색]을 통해서 화면에서 검색할 수 도 있습니다. +\n\n검색화면은 검색을 위한 템플릿을 제공합니다 +\n\t* 주소로 +\n\t* 좌표로 +\n\t* POI로 (by type or by name) +\n\t* 기록된 검색으로 +\n\t* 즐겨찾기로 검색할 수 있습니다. +\n\n컨텍스트 메뉴를 이용하거나 또는 액션 바는 [길안내 또는 지도에서 보기] 등을 제공합니다. " 고유 장치 id 모니터링 설정을 구성하고 개인 모니터링 채널을 설정 "OpenStreetMap 고급 실시간 모니터링. 이에 대해서는 http://osmo.mobi를 참조 하십시오. 다른 장치를 추적하고 추적받는 가능성을 제공 합니다. 익명 그룹을 만들고, 서로의 위치를 공유하고 소통한다. 세션 트래킹 또는 영구 트래킹에 대한 다양한 설정을 합니다. 익명그룹는 수많은 날에 제한되며 일부 기능 즉, 원격 제어 및 그룹 관리자는 제한된다. 완벽하게 기능적인 그룹은 웹사이트에 생성하고 그들에게 등록된 사용자만 액세스할 수 있습니다. " @@ -2001,8 +2000,8 @@ 경유지 도착지 교통 경고 - 가까운 즐겨찾기 알리기 - 가까운 POI 알리기 + 주변의 즐겨찾기 알리기 + 주변의 POI 알리기 버스, 무궤도전차, 셔틀 노선 트랙을 GPX파일로 저장 GPX 파일에 기록하는 일반적인 위치는 지도 화면에 GPX 기록 위젯을 사용하여 켜거나 끌 수 있습니다 From 4c8c73ceb091a02f78a034d28b2f969ed44a6ed4 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Sun, 4 Jan 2015 03:27:08 +0100 Subject: [PATCH 196/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1586 of 1594 strings) --- OsmAnd/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 8989ab5eeb..f000c30cce 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1165,7 +1165,7 @@ \n\t* Ytterligare inställningar för att stabilisera kompassen \n\t* Översta knappen till vänster på kartskärmen ersätter menyknappen - Använd Kalman-filter för att undvika kompassmissvisning + Minskar kompassmissvisningen men blir trögare Använd Kalman-filter App-tema Välj tema för applikationen From 2161c701b2f7e15870070fbecef7bad91e2420f7 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Sat, 3 Jan 2015 23:45:47 +0100 Subject: [PATCH 197/372] Translated using Weblate (Catalan) Currently translated at 34.3% (210 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 49 ++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 8bd4882fa1..120709fedc 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -177,4 +177,53 @@ Central telefònica Reciclatge + Abocador d\'escombraries + Contenidor d\'escombraries + Paperera + + Moll + Equip de vigilància + Observatori + Observatori astronòmic + Torre + En construcció + Fàbrica + Pedrera + Vinya + Plantació de fruiters + Salina + Xarxes de criquet + + Autoescola + Escola + Llar d\'infants + Institut + Universitat + + Serveis socials + Palau de justícia + Presó + Oficina de registre civil + Ambaixada + Oficina governamental + Fiscal + Batlle + Fons de pensions + Migració + Recaptació d\'impostos + Duana + Ciutat + Vila + Poble + Llogaret + Assentament aïllat + Barri + Horts familiars + Granja + + Farmàcia + Hospital + Centre mèdic + Clínica + Primers auxilis From 3ddd5bc937399dc3eac4e18e2c32eaf3216b6cc0 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 09:22:46 +0100 Subject: [PATCH 198/372] initialize with setupFavorites --- OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index b34d97de28..69786993f2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -501,7 +501,7 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca //Needed to reliably initialize DashFavoritesFragement on devices without compass if (f instanceof DashFavoritesFragment && !f.isDetached()) { - ((DashFavoritesFragment) f).updateLocation(null); + ((DashFavoritesFragment) f).setupFavorites(); } } } From 0bc3a14c596b0dc515f3549168fcfbb41587be04 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 09:30:09 +0100 Subject: [PATCH 199/372] make setupFavorites public --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 6e104d6e79..2dd93a97b3 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -87,7 +87,7 @@ public class DashFavoritesFragment extends DashBaseFragment { - private void setupFavorites(){ + public void setupFavorites(){ View mainView = getView(); final FavouritesDbHelper helper = getMyApplication().getFavorites(); points = new ArrayList(helper.getFavouritePoints()); From cd69ed7871b88d56d2facab32efa6bd4ebfeecef Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 12:32:23 +0100 Subject: [PATCH 200/372] Do not hide Waypoints dialogue for now --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 80d10268c8..eb607e3d80 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -204,7 +204,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio protected void selectOnScreen(View parentView, boolean target) { selectFromMapTouch = true; selectFromMapForTarget = target; - hideDialog(); + //Dialogue should be hidden while selecting a target, but mus re-appear afterwards + //hideDialog(); } protected void selectFavorite(final View parentView, final boolean target) { From d28e71a6978244c04813526ee554b24d88a959d5 Mon Sep 17 00:00:00 2001 From: Roberto GEB Date: Sun, 4 Jan 2015 11:42:55 +0100 Subject: [PATCH 201/372] Translated using Weblate (Spanish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-es/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 20141c2f6e..0a796e6923 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -151,7 +151,7 @@ Indefinido Corregido Posición actual… - Última vista del mapa + Centro del mapa actual Origen: Busca cerca de aquí "Cambios en 0.6.7 : \n\t- Gestor de datos descargados (descargar, borrar, activar/desactivar datos descargados directamente en OsmAnd) \n\t- Puntos y grupos favoritos (categorizar, borrar, gestionar favoritos) \n\t- Explorador de GPX en la aplicación (ver detalle del trayecto, distancia, velocidad media, elevación, etc.) \n\t- Navegación GPX (más opciones, continuar la navegación tras un fallo de aplicación, soportar rotondas) \n\t- Función para guardar la ruta como traza GPX para uso sin conexión \n\t- Mejora de la monitorización GPX (filtra alguna posición incorrecta y guarda precisión/elevación/velocidad) \n\t- Envía GPX a la comunidad OSM (http://download.osmand.net/gpx/) \n\t- Mejora del dibujo vectorial \n\t- Mejora del motor TTS (anuncia la distancia exacta, permite millas) \n\t- Arreglo de fallos " @@ -350,7 +350,7 @@ m No se soporta el formato \'\'{0}\'\' de datos obsoletos Asistencia de automóvil - PDI más cercano + PDIs más cercanos Filtro propio Tienda de comida Para turistas @@ -505,7 +505,7 @@ Gracias por elegir OsmAnd. Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Después, podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público. Buscando señal… - Buscar cerca de la última localización + Buscar cerca del dentro del centro del mapa Buscar cercanos Según dispositivo Vertical @@ -1236,7 +1236,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Selecciona favorito Modificaciones OSM Otras acciones - Utiliza el filtro Kalman para evitar aberraciones de la brújula + Reduce el ruido en las lecturas de la brújula pero añade inercia Usar filtro Kalman Modo Accesibilidad: seleccione el destino primero Utiliza el sensor magnético para determinar el valor de la brújula en vez del sensor de orientación From 891447768d1eb83893c4fff807df7a453595d085 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 12:43:58 +0100 Subject: [PATCH 202/372] Hide Waypoint dialogue only while map input is requested --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index eb607e3d80..9c03e78790 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -81,6 +81,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); + showDialog(); return true; } return super.onSingleTap(point, tileBox); @@ -205,7 +206,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio selectFromMapTouch = true; selectFromMapForTarget = target; //Dialogue should be hidden while selecting a target, but mus re-appear afterwards - //hideDialog(); + hideDialog(); } protected void selectFavorite(final View parentView, final boolean target) { From 3f5d1d7590adb1edef00399093215dd25d634899 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 13:49:39 +0100 Subject: [PATCH 203/372] Place dialogue correctly after input has been selected --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 9c03e78790..1eb0b36de8 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -228,6 +228,9 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().setStartPoint(point, true, name); } favoritesDialog.dismiss(); + //Next 2 lines ensure Dialog is shown in the right correct position after a selection been made + hideDialog(); + showDialog(); } }); bld.setView(listView); From 6d1585c5a70c0296077ee81248666e1fda3d45ca Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 15:11:54 +0100 Subject: [PATCH 204/372] Adjust tabs for easier code debugging - no functional change --- .../views/controls/MapRouteInfoControl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 1eb0b36de8..931b07230f 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -371,20 +371,20 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } public String getRoutePointDescription(double lat, double lon) { - return mapActivity.getString(R.string.route_descr_lat_lon, lat, lon); - } + return mapActivity.getString(R.string.route_descr_lat_lon, lat, lon); + } - public String getRoutePointDescription(LatLon l, String d) { - if(d != null && d.length() > 0) { - return d.replace(':', ' '); - } - if(l != null) { - return mapActivity.getString(R.string.route_descr_lat_lon, l.getLatitude(), l.getLongitude()); - } - return ""; - } + public String getRoutePointDescription(LatLon l, String d) { + if(d != null && d.length() > 0) { + return d.replace(':', ' '); + } + if(l != null) { + return mapActivity.getString(R.string.route_descr_lat_lon, l.getLatitude(), l.getLongitude()); + } + return ""; + } - private Spinner setupFromSpinner( View view) { + private Spinner setupFromSpinner( View view) { ArrayList fromActions = new ArrayList(); fromActions.add(mapActivity.getString(R.string.route_descr_current_location)); fromActions.add(mapActivity.getString(R.string.route_descr_favorite)); @@ -414,8 +414,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio return fromSpinner; } - private Spinner setupToSpinner(View view) { - final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner)); + private Spinner setupToSpinner(View view) { + final Spinner toSpinner = ((Spinner) view.findViewById(R.id.ToSpinner)); final TargetPointsHelper targets = getTargets(); ArrayList toActions = new ArrayList(); if (targets.getPointToNavigate() != null) { From b88b1095c47f954275435a84f5a0fb0cf44955ed Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sun, 4 Jan 2015 15:10:25 +0100 Subject: [PATCH 205/372] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 5ccbd53602..e86dcfcdc8 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -414,7 +414,7 @@ 未定義 " " 目前位置… - 上次瀏覽的地圖 + 目前的地圖中心 起點： 查尋這附近 儲存路線成 GPX 軌跡 @@ -1015,7 +1015,7 @@ 另存為 GPX 開啟現有的 GPX 請等待目前的作業結束 - 使用 Kalman 濾波器，以避免電子羅盤的偏差 + 降低電子羅盤讀值雜訊，但增加了慣性 使用 Kalman 濾波器 使用磁性感應器來判斷電子羅盤的值，而不是定位感應器 使用磁性感應器 From 7236cb41301a42f40a228efb365e933f873a9534 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 15:23:13 +0100 Subject: [PATCH 206/372] Check if this fixes the Issue of route-recalculation not starting when From point is changed while previous route was not finished --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 931b07230f..ec1503dea9 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -82,7 +82,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } contextMenu.setLocation(latlon, null); showDialog(); - return true; + //Check if this fixes the Issue of route-recalculation not starting when From point is changed while previous route was not finished + //return true; } return super.onSingleTap(point, tileBox); } From aca4c4e29600f22293b4652289704cd790e0679c Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sun, 4 Jan 2015 15:13:43 +0100 Subject: [PATCH 207/372] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index e86dcfcdc8..158871c384 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -600,7 +600,7 @@ 公里/小時 公尺 舊地圖格式 \'\'{0}\'\' 已不支援 - 最近興趣點 + 最近的興趣點 自訂篩選 線上名稱尋找 正在取讀暫存地圖圖磚… @@ -748,7 +748,7 @@ 接著 下載地區 搜尋訊號中… - 查尋上次位置附近 + 查尋目前地圖中心附近 在附近查尋 與裝置一樣 直豎 From 2f15cf168827a2b98c061205e10e73668971be40 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 15:35:01 +0100 Subject: [PATCH 208/372] back out last change --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index ec1503dea9..931b07230f 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -82,8 +82,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } contextMenu.setLocation(latlon, null); showDialog(); - //Check if this fixes the Issue of route-recalculation not starting when From point is changed while previous route was not finished - //return true; + return true; } return super.onSingleTap(point, tileBox); } From 8532f37a5ae1163f2f64a147ff7d66ded6b61df9 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 16:01:15 +0100 Subject: [PATCH 209/372] more tabs --- .../views/controls/MapRouteInfoControl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 931b07230f..d249fee78b 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -111,7 +111,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } private Dialog createDialog() { - AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity); + AlertDialog.Builder builder = new AlertDialog.Builder(mapActivity); View lmain = mapActivity.getLayoutInflater().inflate(R.layout.plan_route_info, null); boolean addButtons = routingHelper.isRouteCalculated(); updateInfo(lmain); @@ -129,20 +129,20 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio textView.setVisibility(View.GONE); } } - builder.setView(lmain); - - Dialog dialog = builder.create(); - dialog.setCanceledOnTouchOutside(true); - WindowManager.LayoutParams lp = new WindowManager.LayoutParams(); - lp.copyFrom(dialog.getWindow().getAttributes()); - lp.width = WindowManager.LayoutParams.WRAP_CONTENT; - lp.height = WindowManager.LayoutParams.WRAP_CONTENT; - lp.gravity = Gravity.BOTTOM; + builder.setView(lmain); + + Dialog dialog = builder.create(); + dialog.setCanceledOnTouchOutside(true); + WindowManager.LayoutParams lp = new WindowManager.LayoutParams(); + lp.copyFrom(dialog.getWindow().getAttributes()); + lp.width = WindowManager.LayoutParams.WRAP_CONTENT; + lp.height = WindowManager.LayoutParams.WRAP_CONTENT; + lp.gravity = Gravity.BOTTOM; lp.y = (int) (infoButton.getBottom() - infoButton.getTop() + scaleCoefficient * 5 + getExtraVerticalMargin()); - dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); - dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); - dialog.getWindow().setAttributes(lp); - return dialog; + dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); + dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); + dialog.getWindow().setAttributes(lp); + return dialog; } private void updateInfo(final View parentView) { From c5004d50dfef83cf5c99f7c54f018b7dffad6046 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 17:04:15 +0100 Subject: [PATCH 210/372] Remove obsolete comment --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index d249fee78b..853fbe4bd3 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -205,7 +205,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio protected void selectOnScreen(View parentView, boolean target) { selectFromMapTouch = true; selectFromMapForTarget = target; - //Dialogue should be hidden while selecting a target, but mus re-appear afterwards hideDialog(); } From e8d51064e777303086933f95f325f5bc8fcc6c62 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Sun, 4 Jan 2015 16:52:26 +0100 Subject: [PATCH 211/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-be/strings.xml | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index e40a6e5515..d2c6c08a21 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -5,9 +5,9 @@ Драбней Лупа мапы Асноўная мапа сьвету - Версія: + Вэрсія: Аб праграме - Версія, ліцэнзіі, удзельнікі праекта + Вэрсія, ліцэнзіі, удзельнікі праекту Дапамога Зьмены ў 1.6: ↵ \n\t* Падтрымка прылад з Full HD; ↵ @@ -24,7 +24,7 @@ Сьцягнутыя маштабы: %1$s Тэрмін дзеяньня (у хвілінах): %1$s Можна сьцягнуць: %1$s - Максімальнае павелічэньне: %1$s + Максымальнае павелічэньне: %1$s Мінімальнае павелічэньне: %1$s Зьвесткі квадрата: %1$s Крыніца квадратаў мапы %1$s пасьпяхова захаваная @@ -114,7 +114,7 @@ Захаваць як GPX Адчыніць існы GPX Калі ласка, пачакайце пакуль бягучая задача не будзе завершаная - Выкарыстоўваць фільтар Калмана каб прадухіліць абэрацыю компасу + Зьніжае шум паказаньняў компасу, але дадае інэрцыю Выкарыстоўваць фільтар Калмана Рэжым даступнасьці: Калі ласка, спачатку абярыце пункт прызначэньня Выкарыстоўваць для працы компаса магнітны датчык замест датчыка арыентацыі @@ -1467,7 +1467,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві баснійская балгарская каталонская - чэшская + чэская дацкая галяндзкая фінская @@ -1501,7 +1501,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Паўночная Амэрыка - Канада Эўропа - Італія Эўропа - Вялікабрытанія - Вылічыць сегмент маршруту OsmAnd без Інтэрнэту + Вылічыць адрэзак маршруту OsmAnd без Інтэрнэту Вылічыць маршрут OsmAnd для першага і апошняга ўчастка маршруту Ці хочаце вы выкарыстоўваць адлюстраваны сьлед для навігацыі? Выбраць на мапе… @@ -1562,7 +1562,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Пешы турызм Судна Калі ласка, наведайце https://code.google.com/p/osmand/wiki/FAQ каб пабачыць часта задаваныя пытаньні. - Вы зьбіраецеся выдаліць %1$d змены OSM. Вы ўпэўненыя? + Вы зьбіраецеся выдаліць %1$d зьмены OSM. Вы ўпэўненыя? Калі ласка, спачатку разьлічыце маршрут Не адсочваць аб\'ект З версіі 4.4 Android (KitKat) вы ня можаце загружаць і абнаўляць мапу ў папярэднім каталогу захоўваньня (%s). Вы хочаце зьмяніць каталог на дазволены і скапіяваць усе файлы OsmAnd туды?\n Заўвага 1: Вашы старыя файлы застануцца некранутымі (вы можаце выдаліць іх самастойна).          @@ -1582,7 +1582,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Выберыце профілі карыстання бачныя ў праграме Голас Рознае - Лакалізацыя + Лякалізацыя Перапыненьне музыкі Унікальны ідэнтыфікатар прылады Глянуць унікальны рэгістрацыйны ключ прыстасаваньня і наладзіць асабісты канал адсочваньня @@ -1662,8 +1662,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\t- Выпраўленні памылак ↵ Праблема з падключэньнем OsMo: - Спыніць сесію OsMo - Запусьціць сесію OSMo + Спыніць сэсыю OsMo + Запусьціць сэсыю OSMo Падзяліцца Выбранае адаслана праз OsmAnd @@ -1678,17 +1678,17 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Аўтаматычна пачынаць запіс сьледу і перадачу месцазнаходжаньня пасьля старту праграмы Аўтаматычна пачынаць адсылку месцазнаходжаньня - Персанальны ID трэкера + Пэрсанальны ID трэкера Націсніце, каб паглядзець ці падзяліцца ідэнтыфікатарам трэкера.          Выкарыстаньне ідэнтыфікатара трэкера звязанага з прыстасаваньнем дасць магчымасць кантраляваць усе перамяшчэньні гэтага прыстасаваньня! Для адключэньня выберыце опцыю перастварэньня. - Токен сесіі: %1$s + Токен сэсыі: %1$s У чаканьні дазволу… "Месцазнаходжаньне адаслана %1$d (у буферы %2$d) " Злучэньне ўстаноўлена: %1$s - Пачаць OsMo сэсію паўторна + Пачаць OsMo сэсыю паўторна Адладачная інфармацыя гадзін таму хвілін таму - секунд таму + сэкунд таму Імя карыстальніка ID трэкера Сувязь з прыстасаваньнем @@ -1700,9 +1700,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Група OsMo Каб падключыцца да групы %2$s, задайце ID групы (%1$s) або націсьніце %3$s. Дазволіць пастаянна адсочваць дадзенае прыстасаваньне - Падзяліцца бягучай сесіяй у браўзэры - Падзяліцца сэсіяй - URL сесіі для адсочваньня прыстасаваньня (%1$s) + Падзяліцца бягучай сэсыяй у браўзэры + Падзяліцца сэсыяй + URL сэсыі для адсочваньня прыстасаваньня (%1$s) Выберыце часавы інтэрвал для адпраўкі месцазнаходжаньня дзён Падключыцца @@ -1736,7 +1736,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Выбар колеру Зьмяніць налады карыстальніка Увайсьці - Для таго каб стварыць групы вы павінны быць зарэгістраваным карыстальнікам OsMo. + Для стварэньня групы, вы павінны быць зарэгістраваным карыстальнікам OsMo. Уведзеныя зьвесткі не сапраўдныя. Вы ўпэўненыя, што хочаце перастварыць асабістыя ідэнтыфікатары? Усе прыстасаваньні, падлучаныя да вас больш не змогуць адсочваць вас. Перастварыць ідэнтыфікатар карыстальніка @@ -1745,8 +1745,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Карыстальнік зялёны - Усталяваць рухомай мішэньню - Скасаваць рухомую мішэнь + Усталяваць рухомай цэльлю + Скасаваць рухомую цэль Цэнтраваць экран Суправаджаць Карыстальнік %1$s далучыўся да групы %2$s @@ -1765,11 +1765,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Пачатак: %1$tF, %1$tT Канец: %1$tF, %1$tT Сярэдняя хуткасьць: %1$s - Максімальная хуткасьць: %1$s + "Максымальная хуткасьць: %1$s " Сярэдняя вышыня: %1$s Прамежак часу: %1$s Час руху: %1$s - Сегмент + Адрэзак " %1$s пунктаў" Пункт %1$s запіс @@ -1817,7 +1817,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Схаваць будынкі Схаваць не аўтамабільныя дарогі Схаваць тэкст - Схаваць лясы і хмызнякі + Схаваць лясы і хмызьнякі Будынкі на маштабе 15 Больш падрабязна Менш падрабязна From 62d84970c68eac0e777eb5cf73ad1e3b019d6165 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Sun, 4 Jan 2015 16:47:30 +0100 Subject: [PATCH 212/372] Translated using Weblate (Slovak) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-sk/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 48f738576b..4c36b01f9b 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -323,7 +323,7 @@ Neurčené Aktuálne umiestnenie… - Posledné mapové zobrazenie + Terajší stred mapy Východzí bod: Hľadať "Novinky vo verzii 0.6.7 : @@ -545,7 +545,7 @@ km/h m Zastaralý formát mapových údajov "{0}" nie je podporovaný - Najbližšie body záujmu + Najbližší bod záujmu Vlastný filter Online hľadač mien Načítavajú sa dlaždice zo zásobníka… @@ -703,7 +703,7 @@ Stiahnuť oblasti Ďakujeme, že ste si vybrali OsmAnd. Na použitie hlavných funkcií tejto aplikácie potrebujete nejaké regionálne offline údaje, ktoré si môžete stiahnuť (použite Nastavenia → Mapové súbory). Potom budete môcť zobrazovať mapy, vyhľadávať adresy, body záujmov (POI) a hromadnú dopravu. Hľadá sa signál… - Hľadať v blízkosti poslednej pozície + Hľadať v blízkosti terajšieho stredu mapy Hľadať neďaleko Vás Podľa zariadenia Na výšku @@ -1254,7 +1254,7 @@ Použiť magnetický senzor namiesto orientačného na zistenie hodnôt kompasu Použiť magnetický senzor (kompas) Prosím, čakajte, kým sa dokončí aktuálna úloha - Použiť Kalmanov filter na zabránenie odchýliek kompasu + Zníži šum v hodnotách z kompasu, ale spomalí zmeny smeru Upožiť Kalmanov filter Režim zjednodušeného ovládania: prosím, najskôr vyberte cieľ Odstrániť bod From 6747911754028859f85abfffc8be67f9bd228aa0 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 18:38:19 +0100 Subject: [PATCH 213/372] Document small bug which had already been there but is now discovered --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 853fbe4bd3..a0dd58ce01 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -82,6 +82,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } contextMenu.setLocation(latlon, null); showDialog(); + //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point return true; } return super.onSingleTap(point, tileBox); From 1a99a0c9c5f508af5daa4a9865bc3e3013f4b925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Sun, 4 Jan 2015 17:30:39 +0100 Subject: [PATCH 214/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-hu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 25215f4f05..266d8e3e33 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1210,7 +1210,7 @@ Teljes verzió A mágnesszenzor használata az iránytű értékének meghatározásához az tájolás szenzor helyett Mágnesszenzor (iránytű) használata - Kálmán-szűrő használata az iránytű stabilizálására + Csökkenti a zajt az iránytű olvasásakor, de hozzáadja a tehetetlenséget Kálmán-szűrő használata Kisegítő mód: előbb válassz célpontot "Az 1.3 kiadás újdonságai: From dc2ef772dcea5224d97c01da2ac93eef344bd2dc Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 19:32:50 +0100 Subject: [PATCH 215/372] test if Waypoint dialogue bug is related dialogue being hidden --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index a0dd58ce01..7f1ce2215f 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -75,13 +75,14 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio if(selectFromMapTouch) { LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; + showDialog(); if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); } else { getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); - showDialog(); + //showDialog(); //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point return true; } From 69ac75afb3cdba54a0ab0ca4d6c3bdd1a9d23ea5 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 19:52:37 +0100 Subject: [PATCH 216/372] try leaving both showDialog statements in --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 7f1ce2215f..e1bce9e76f 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -75,14 +75,14 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio if(selectFromMapTouch) { LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; - showDialog(); + showDialog(); if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); } else { getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); - //showDialog(); + showDialog(); //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point return true; } From 045375b1936ac5eb814aa1dda33252e79909d2ea Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 20:04:04 +0100 Subject: [PATCH 217/372] try with hide/show combination --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index e1bce9e76f..9d0e7febdb 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -75,6 +75,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio if(selectFromMapTouch) { LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; + //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point showDialog(); if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); @@ -82,8 +83,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); + hideDialog(); showDialog(); - //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point return true; } return super.onSingleTap(point, tileBox); From bda55ed470f44fe1aa4303f63444969834b60309 Mon Sep 17 00:00:00 2001 From: Marco Antonio Date: Sun, 4 Jan 2015 20:00:37 +0100 Subject: [PATCH 218/372] Translated using Weblate (Spanish) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 0a796e6923..e977315b63 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -505,7 +505,7 @@ Gracias por elegir OsmAnd. Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Después, podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público. Buscando señal… - Buscar cerca del dentro del centro del mapa + Buscar cerca del centro del mapa Buscar cercanos Según dispositivo Vertical From 7f06b56ba4abad023043d2bbef424a0142c2fd84 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 20:23:07 +0100 Subject: [PATCH 219/372] try splitting dialog.hide and hideDialog --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 9d0e7febdb..74c9d34975 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -76,7 +76,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point - showDialog(); if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); } else { @@ -208,7 +207,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio protected void selectOnScreen(View parentView, boolean target) { selectFromMapTouch = true; selectFromMapForTarget = target; - hideDialog(); + //hideDialog(); + dialog.hide(); } protected void selectFavorite(final View parentView, final boolean target) { From dc6dad9546efc383ffa370ef5f387ec32957ff06 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 20:46:33 +0100 Subject: [PATCH 220/372] revert, it did not fix the small bug --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 74c9d34975..6347973bba 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -82,7 +82,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); - hideDialog(); showDialog(); return true; } @@ -207,8 +206,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio protected void selectOnScreen(View parentView, boolean target) { selectFromMapTouch = true; selectFromMapForTarget = target; - //hideDialog(); - dialog.hide(); + hideDialog(); } protected void selectFavorite(final View parentView, final boolean target) { From a5010cd19b6faf2751ea90fd38817b9171614437 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 20:53:43 +0100 Subject: [PATCH 221/372] try something strange: duplicate calls --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 6347973bba..642a13e794 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -78,8 +78,10 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); + getTargets().navigateToPoint(latlon, true, -1); } else { getTargets().setStartPoint(latlon, true, null); + getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); showDialog(); From d4c5e748e385b92a7abb15716e9451c1f37b5def Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Jan 2015 20:57:20 +0100 Subject: [PATCH 222/372] Never cache activities they could be not active --- .../net/osmand/plus/FavouritesDbHelper.java | 34 +++++++++---------- .../osmand/plus/OsmAndAppCustomization.java | 6 ++++ .../net/osmand/plus/OsmandApplication.java | 17 ---------- .../osmand/plus/activities/MapActivity.java | 4 +-- .../osmand/plus/dialogs/FavoriteDialogs.java | 20 +++++++++-- .../plus/download/DownloadActivity.java | 4 +-- .../osmand/plus/helpers/GpxImportHelper.java | 3 +- .../plus/sherpafy/SherpafyCustomization.java | 17 ++++++++-- 8 files changed, 60 insertions(+), 45 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java index 65f4a51cd9..b3e8d39e3c 100644 --- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java +++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java @@ -16,6 +16,7 @@ import java.util.regex.Pattern; import android.app.AlertDialog; import android.content.ActivityNotFoundException; +import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; @@ -151,9 +152,6 @@ public class FavouritesDbHelper { } FavoriteGroup group = getOrCreateGroup(p, 0); - //making sure that dublicated names will not occur in favorites - checkDublicates(p); - if (!p.getName().equals("")) { p.setVisible(group.visible); p.setColor(group.color); @@ -167,45 +165,45 @@ public class FavouritesDbHelper { return true; } - private void checkDublicates(FavouritePoint p){ - boolean fl = true; + public static AlertDialog.Builder checkDublicates(FavouritePoint p, FavouritesDbHelper fdb, Context uiContext) { boolean emoticons = false; String index = ""; int number = 0; String name = checkEmoticons(p.getName()); String category = checkEmoticons(p.getCategory()); p.setCategory(category); - if (name.length() != p.getName().length()){ + if (name.length() != p.getName().length()) { emoticons = true; } - while (fl){ + boolean fl = true; + while (fl) { fl = false; - for (FavouritePoint fp : cachedFavoritePoints){ - if (fp.getName().equals(name)){ + for (FavouritePoint fp : fdb.getFavouritePoints()) { + if (fp.getName().equals(name)) { number++; index = " (" + number + ")"; name = p.getName() + index; - fl=true; + fl = true; break; } } } - if ((index.length() > 0 || emoticons)&& - context.getMapActivity() != null){ - AlertDialog.Builder builder = new AlertDialog.Builder(context.getMapActivity()); + if ((index.length() > 0 || emoticons) ) { + AlertDialog.Builder builder = new AlertDialog.Builder(uiContext); builder.setTitle(R.string.fav_point_dublicate); - if (emoticons){ - builder.setMessage(context.getString(R.string.fav_point_emoticons_message, name)); + if (emoticons) { + builder.setMessage(uiContext.getString(R.string.fav_point_emoticons_message, name)); } else { - builder.setMessage(context.getString(R.string.fav_point_dublicate_message, name)); + builder.setMessage(uiContext.getString(R.string.fav_point_dublicate_message, name)); } builder.setPositiveButton(R.string.default_buttons_ok, null); p.setName(name); - builder.show(); + return builder; } + return null; } - public String checkEmoticons(String name){ + public static String checkEmoticons(String name){ char[] chars = name.toCharArray(); int index; char ch1; diff --git a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java index ac9c2ce641..3629bd4d31 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java @@ -152,4 +152,10 @@ public class OsmAndAppCustomization { return false; } + public void resumeActivity(Class class1, T d) { + } + + public void pauseActivity(Class class1) { + } + } diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index 3968ca0eca..ac3f9b5fe0 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -117,9 +117,6 @@ public class OsmandApplication extends Application { SQLiteAPI sqliteAPI; BRouterServiceConnection bRouterServiceConnection; - - MapActivity mapActivity; - DownloadActivity downloadActivity; // Typeface @@ -915,19 +912,5 @@ public class OsmandApplication extends Application { } } - public MapActivity getMapActivity() { - return mapActivity; - } - public void setMapActivity(MapActivity mapActivity) { - this.mapActivity = mapActivity; - } - - public void setDownloadActivity(DownloadActivity downloadActivity) { - this.downloadActivity = downloadActivity; - } - - public DownloadActivity getDownloadActivity() { - return downloadActivity; - } } diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 9b30725a63..1d24a5f819 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -369,7 +369,6 @@ public class MapActivity extends AccessibleActivity { } settings.MAP_ACTIVITY_ENABLED.set(true); - app.setMapActivity(this); checkExternalStorage(); showAndHideMapPosition(); @@ -443,6 +442,7 @@ public class MapActivity extends AccessibleActivity { if(atlasMapRendererView != null) { atlasMapRendererView.handleOnResume(); } + getMyApplication().getAppCustomization().resumeActivity(MapActivity.class, this); } @@ -661,7 +661,7 @@ public class MapActivity extends AccessibleActivity { settings.setLastKnownMapZoom(mapView.getZoom()); settings.MAP_ACTIVITY_ENABLED.set(false); - app.setMapActivity(null); + getMyApplication().getAppCustomization().pauseActivity(MapActivity.class); app.getResourceManager().interruptRendering(); app.getResourceManager().setBusyIndicator(null); OsmandPlugin.onMapActivityPause(this); diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java index e80bf16205..f125106510 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java @@ -12,17 +12,17 @@ import net.osmand.AndroidUtils; import net.osmand.access.AccessibleToast; import net.osmand.data.FavouritePoint; import net.osmand.plus.FavouritesDbHelper; +import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; -import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.FavoriteImageDrawable; import net.osmand.util.MapUtils; import android.app.Activity; import android.app.AlertDialog; -import android.app.Dialog; import android.app.AlertDialog.Builder; +import android.app.Dialog; import android.content.DialogInterface; import android.content.res.Resources; import android.os.Build; @@ -202,13 +202,27 @@ public class FavoriteDialogs { builder.setPositiveButton(R.string.default_buttons_add, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - FavouritePoint point = (FavouritePoint) args.getSerializable(KEY_FAVORITE); + final FavouritePoint point = (FavouritePoint) args.getSerializable(KEY_FAVORITE); OsmandApplication app = (OsmandApplication) activity.getApplication(); String categoryStr = cat.getText().toString().trim(); final FavouritesDbHelper helper = app.getFavorites(); app.getSettings().LAST_FAV_CATEGORY_ENTERED.set(categoryStr); point.setName(editText.getText().toString().trim()); point.setCategory(categoryStr); + Builder bld = FavouritesDbHelper.checkDublicates(point, helper, activity); + if(bld != null) { + bld.setPositiveButton(R.string.default_buttons_ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + addFavorite(activity, point, helper); + } + }); + } else { + addFavorite(activity, point, helper); + } + } + + protected void addFavorite(final Activity activity, FavouritePoint point, final FavouritesDbHelper helper) { boolean added = helper.addFavourite(point); if (added) { AccessibleToast.makeText(activity, MessageFormat.format( diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java index aca427c9e1..fb5cf31a82 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java @@ -171,7 +171,7 @@ public class DownloadActivity extends BaseDownloadActivity { @Override protected void onResume() { super.onResume(); - getMyApplication().setDownloadActivity(this); + getMyApplication().getAppCustomization().resumeActivity(DownloadActivity.class, this); } @@ -208,7 +208,7 @@ public class DownloadActivity extends BaseDownloadActivity { @Override public void onPause() { super.onPause(); - (getMyApplication()).setDownloadActivity(null); + getMyApplication().getAppCustomization().pauseActivity(DownloadActivity.class); } @Override diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java index 91d08cd075..07f9efdaf7 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java +++ b/OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java @@ -65,7 +65,8 @@ public class GpxImportHelper { if (fileName != null && fileName.endsWith(KML_SUFFIX)) { handleKmlImport(intentUri, fileName, saveFile); - } else if (fileName != null && fileName.endsWith("favourites.gpx")) { + } else if (fileName != null && (fileName.contains("favourite")|| + fileName.contains("favorite"))) { handleFavouritesImport(intentUri, fileName, saveFile); } else { handleGpxImport(intentUri, fileName, saveFile); diff --git a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java index 65d60e2284..ebf6e7fb03 100644 --- a/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java +++ b/OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -82,6 +83,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization { public static final String TOUR_SERVER = "download.osmand.net"; private static final String SAVE_GPX_FOLDER = "save_gpx_folder"; private Object originalGlobal; + private Map, Object> activities = new HashMap, Object>(); @Override public void setup(OsmandApplication app) { @@ -205,7 +207,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization { } this.tourPresent = tourPresent; if(!suggestToDownloadMap.isEmpty()) { - final DownloadActivity da = app.getDownloadActivity(); + final DownloadActivity da = (DownloadActivity) activities.get(DownloadActivity.class); if (da != null) { app.runInUIThread(new Runnable() { @@ -662,7 +664,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization { } public boolean onDestinationReached() { - final MapActivity map = app.getMapActivity(); + final MapActivity map = (MapActivity) activities.get(MapActivity.class); if(map != null && getSelectedStage() != null) { app.runInUIThread(new Runnable() { @@ -675,6 +677,17 @@ public class SherpafyCustomization extends OsmAndAppCustomization { return true; } + @Override + public void pauseActivity(Class class1) { + super.pauseActivity(class1); + } + + @Override + @SuppressWarnings("unchecked") + public void resumeActivity(Class class1, T d) { + activities.put((Class) class1, d); + } + public void runStage(Activity a, TourInformation tour, StageInformation stage, boolean startOver) { WptPt point = null; GPXFile gpx = null; From 486c4a30ba0aecfd20abdc74be08a1036f4c78b3 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 21:12:01 +0100 Subject: [PATCH 223/372] revert, this fixed it in the wrong direction... --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 642a13e794..6347973bba 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -78,10 +78,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); - getTargets().navigateToPoint(latlon, true, -1); } else { getTargets().setStartPoint(latlon, true, null); - getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); showDialog(); From d7ca917eff73c76507b15d8d4dd665c2a4416e69 Mon Sep 17 00:00:00 2001 From: sonora Date: Sun, 4 Jan 2015 23:52:15 +0100 Subject: [PATCH 224/372] amend bug description comment with latest test results --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 6347973bba..b73fa2394e 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -75,7 +75,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio if(selectFromMapTouch) { LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; - //TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point + //TODO: Hardy: Looks like there is a small bug here somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to (sometimes?) only interrupt the ongoing route calculation, but not restart it again with the new points if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); } else { From 69d6d20716252856e5f371e883e06619079967e0 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Sun, 4 Jan 2015 22:01:08 +0100 Subject: [PATCH 225/372] Translated using Weblate (Russian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-ru/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 1160fdd83f..42a3fed8b9 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -276,7 +276,7 @@ Неопределенно Точка Текущее местоположение… - Вид карты + Текущий центр карты Начало: Искать рядом Изменения в 0.6.7: @@ -624,7 +624,7 @@ Продолжить Загрузить детальные карты регионов Поиск сигнала… - Искать вокруг выбранного центра карты + Искать вокруг текущего центра карты Искать рядом По умолчанию Портрет @@ -1247,7 +1247,7 @@ Выберите по запросу OsmAnd карты и навигация OsmAnd+ карты и навигация - Использовать фильтр Калмана для избежания отклонений компаса + Уменьшает \"шум\" компаса, но добавляет инерцию Использовать фильтр Калмана Прекратить навигацию Использовать датчик магнитного поля From ab58f3a120716888bcfa3cd9c811d5c2540d4b70 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Jan 2015 01:46:23 +0100 Subject: [PATCH 226/372] Proper GPX intent handling, replace undocumented 'category' with existing 'type' for favourites.gpx --- OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java | 2 +- OsmAnd/src/net/osmand/plus/GPXUtilities.java | 7 ++++++- .../net/osmand/plus/activities/FavouritesTreeFragment.java | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java index fa116d256f..92b98c0f24 100644 --- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java +++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java @@ -315,7 +315,7 @@ public class FavouritesDbHelper { return false; } - private File getExternalFile() { + public File getExternalFile() { return new File(context.getAppPath(null), FILE_TO_SAVE); } diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index e88d16604c..208d1d4bf3 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -88,6 +88,7 @@ public class GPXUtilities { public double lon; public String name = null; public String link = null; + // previous undocumented feature 'category' ,now 'type' public String category = null; public String desc = null; // by default @@ -760,7 +761,7 @@ public class GPXUtilities { serializer.attribute(null, "link", p.link); serializer.endTag(null, "link"); } - writeNotNullText(serializer, "category", p.category); + writeNotNullText(serializer, "type", p.category); if (!Double.isNaN(p.hdop)) { writeNotNullText(serializer, "hdop", p.hdop + ""); } @@ -925,6 +926,10 @@ public class GPXUtilities { ((WptPt) parse).link = parser.getAttributeValue("", "href"); } else if (tag.equals("category")) { ((WptPt) parse).category = readText(parser, "category"); + } else if (tag.equals("type")) { + if(((WptPt) parse).category == null) { + ((WptPt) parse).category = readText(parser, "type"); + } } else if (parser.getName().equals("ele")) { String text = readText(parser, "ele"); if (text != null) { diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java index 43d0c921f7..7a7c266ec0 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesTreeFragment.java @@ -38,6 +38,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; import android.graphics.Typeface; +import android.net.Uri; import android.os.AsyncTask; import android.support.v4.app.FragmentActivity; import android.text.Spannable; @@ -524,9 +525,11 @@ public class FavouritesTreeFragment extends OsmandExpandableListFragment { hideProgressBar(); final Intent sendIntent = new Intent(); sendIntent.setAction(Intent.ACTION_SEND); - sendIntent.putExtra(Intent.EXTRA_TEXT, GPXUtilities.asString(gpxFile, getMyApplication())); + sendIntent.putExtra(Intent.EXTRA_TEXT, "Favourites.gpx:\n\n\n"+GPXUtilities.asString(gpxFile, getMyApplication())); sendIntent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.share_fav_subject)); - sendIntent.setType("application/gpx+xml"); + sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(helper.getExternalFile())); +// sendIntent.setType("application/gpx+xml"); + sendIntent.setType("text/plain"); startActivity(sendIntent); } }; From b160f6d17416778cc387f167df4014decf0b8aee Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 09:37:45 +0100 Subject: [PATCH 227/372] Enter comment to explain freeing of direction arrows with Accessibility mode = ON --- .../src/net/osmand/plus/activities/search/SearchPOIActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index bf585e8827..2bef3c618f 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -345,6 +345,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa } else if(isSearchByNameFilter() ){ searchFilterLayout.setVisibility(View.VISIBLE); } + //Freeze the direction arrows (reference is constant north) when Accessibility mode = ON, so screen can be read aloud without continuous updates if(!app.accessibilityEnabled()) { app.getLocationProvider().addCompassListener(this); app.getLocationProvider().registerOrUnregisterCompassListener(true); From d939146afdb1d3a278f9f5b833f45fc089711d83 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Mon, 5 Jan 2015 13:32:42 +0100 Subject: [PATCH 228/372] Update AndroidManifest.xml Increase min sdk version to 2.3 (so we release better tested software) --- OsmAnd/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml index 2ec21f1f25..40d3aa21de 100644 --- a/OsmAnd/AndroidManifest.xml +++ b/OsmAnd/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="201" package="net.osmand.plus"> - + From a28055c43a0205d20d949e2380ca0812fbb5fa00 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 13:57:22 +0100 Subject: [PATCH 229/372] Try using NEW keyword to fix bug --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index b73fa2394e..0227260130 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -73,7 +73,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio @Override public boolean onSingleTap(PointF point, RotatedTileBox tileBox) { if(selectFromMapTouch) { - LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); + LatLon new latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; //TODO: Hardy: Looks like there is a small bug here somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to (sometimes?) only interrupt the ongoing route calculation, but not restart it again with the new points if(selectFromMapForTarget) { From edb90f9472211181cdd1df99a05f338fa9e77720 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Mon, 5 Jan 2015 13:57:34 +0100 Subject: [PATCH 230/372] Translated using Weblate (Catalan) Currently translated at 36.0% (220 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 120709fedc..d57ceb9c25 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -226,4 +226,14 @@ Centre mèdic Clínica Primers auxilis + Vèrtex geodèsic + Molí de vent + Veterinari + Medicina alternativa + Audiòleg + Banc de sang + Centre mèdic + Llevadora + Terapeuta ocupacional + Optometrista From ec95a1901928adf2e42f617d759cb3b27c1fc2cf Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 14:03:51 +0100 Subject: [PATCH 231/372] get syntax right --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 0227260130..c0e86b0f9e 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -73,7 +73,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio @Override public boolean onSingleTap(PointF point, RotatedTileBox tileBox) { if(selectFromMapTouch) { - LatLon new latlon = tileBox.getLatLonFromPixel(point.x, point.y); + latlon = new LatLon(tileBox.getLatLonFromPixel(point.x, point.y)); selectFromMapTouch = false; //TODO: Hardy: Looks like there is a small bug here somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to (sometimes?) only interrupt the ongoing route calculation, but not restart it again with the new points if(selectFromMapForTarget) { From 551109c860b08c2267a8eb563eb6aad087eef9d0 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Mon, 5 Jan 2015 14:01:30 +0100 Subject: [PATCH 232/372] Translated using Weblate (Catalan) Currently translated at 36.9% (226 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index d57ceb9c25..1158962877 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -236,4 +236,11 @@ Llevadora Terapeuta ocupacional Optometrista + Fisioterapeuta + Podòleg + Psicoterapeuta + Rehabilitació + Logopeda + Serveis mèdics + From f91d2da0ca5c1adcf3e01ffb6faaca556f27f718 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 14:05:52 +0100 Subject: [PATCH 233/372] fix typo --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index c0e86b0f9e..8636f9894e 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -73,7 +73,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio @Override public boolean onSingleTap(PointF point, RotatedTileBox tileBox) { if(selectFromMapTouch) { - latlon = new LatLon(tileBox.getLatLonFromPixel(point.x, point.y)); + LatLon latlon = new LatLon(tileBox.getLatLonFromPixel(point.x, point.y)); selectFromMapTouch = false; //TODO: Hardy: Looks like there is a small bug here somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to (sometimes?) only interrupt the ongoing route calculation, but not restart it again with the new points if(selectFromMapForTarget) { From 4b8f7aff345f1910cecaa5bc003bb0b26c298491 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 14:10:10 +0100 Subject: [PATCH 234/372] revert for now --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 8636f9894e..b73fa2394e 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -73,7 +73,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio @Override public boolean onSingleTap(PointF point, RotatedTileBox tileBox) { if(selectFromMapTouch) { - LatLon latlon = new LatLon(tileBox.getLatLonFromPixel(point.x, point.y)); + LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; //TODO: Hardy: Looks like there is a small bug here somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to (sometimes?) only interrupt the ongoing route calculation, but not restart it again with the new points if(selectFromMapForTarget) { From 12a3790cee2b3d000f6635b5111202b32936efd1 Mon Sep 17 00:00:00 2001 From: Dmitriy Prodchenko Date: Mon, 5 Jan 2015 17:05:19 +0200 Subject: [PATCH 235/372] Icon for OsMo. --- OsmAnd/res/drawable-hdpi/ic_osmo_dark.png | Bin 0 -> 1528 bytes OsmAnd/res/drawable-hdpi/ic_osmo_light.png | Bin 0 -> 1625 bytes OsmAnd/res/drawable-mdpi/ic_osmo_dark.png | Bin 0 -> 1332 bytes OsmAnd/res/drawable-mdpi/ic_osmo_light.png | Bin 0 -> 1419 bytes OsmAnd/res/drawable-xhdpi/ic_osmo_dark.png | Bin 0 -> 1712 bytes OsmAnd/res/drawable-xhdpi/ic_osmo_light.png | Bin 0 -> 1808 bytes OsmAnd/res/drawable-xxhdpi/ic_osmo_dark.png | Bin 0 -> 2213 bytes OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png | Bin 0 -> 2344 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/ic_osmo_dark.png create mode 100644 OsmAnd/res/drawable-hdpi/ic_osmo_light.png create mode 100644 OsmAnd/res/drawable-mdpi/ic_osmo_dark.png create mode 100644 OsmAnd/res/drawable-mdpi/ic_osmo_light.png create mode 100644 OsmAnd/res/drawable-xhdpi/ic_osmo_dark.png create mode 100644 OsmAnd/res/drawable-xhdpi/ic_osmo_light.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_osmo_dark.png create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png diff --git a/OsmAnd/res/drawable-hdpi/ic_osmo_dark.png b/OsmAnd/res/drawable-hdpi/ic_osmo_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f4896f6402405bac70ea9fd37cfe981ba1917084 GIT binary patch literal 1528 zcmbVMeNYr-7+;_W8Rf%J5h{1~xP)?VcaOb~-8dQGI5^}0&npj#WIx{HcHnNW-90(5 znnH)v5mOw$NDb4OOp8V(O|(%=RBU9lO#Gt3MzasJL8mdDacmDb>kr32+L_(=ect!^ zJJ}NtI&oG>M~s^bSv{jkJ7+M0LtS<7Ql8N zQwyAc;TzxT133^Bvrurk6}O|5=0u;43G3)WzJQ8`pq$)LfZ^(Z0<)l2@LP~S4<1Hf zfwv&@4G!E9C;(oexJd%@n#x>UQyoX~NbYPnCq%0Td_ZB~kgwh^(;*8oYL`~`;bRPe zM^%(M3o=H^?WlkYLR zD1zvR!xkA<3@R2xWjYpuFW_)IGVGVf6Q!mM3o!wV(BYWR7mjOGTUMOlUmB0qmR*ej zfH{FI1|?3dhes0utGRo!qp+gNhAx)`wJ1!zRpf#`;8*Nc3!>iWc!8%$1JARp(TM7e zMiQlPl0qqp*P}*200YO8z{BzpJCDQLjJQ>AGvgFlm`@OeWIkav*hn)$nyrN1nrDt+ z?S5Hd{2Yk*7F6G3Sd;CESh_$0j3P=dQLK-2L4{XTMA<6_;DUnDs>7M{1wSt~$XVes zjYVw*lCTi)Hc9lsqj{!<$8gBzIgVq28O04A9wm9wh*Bm4ff{iZuslJq9AiYr@%;bI zAEuJR!p-uZ=7}7s9U0y}8UZzXZ|DG_bx4#H5pSCt{hT}hR??^u8T)KR1RNk8R zHa%QS#eG-rpE0s5CU@$K*^Bmmbn)T=`Hg`u?%AEM-}&}hdF;7(XU()L?<1io)Al*5 zTiZhvUmV9D*_%FV%V{L;nbUP?rP#^t`)%3emuI-V{)*>4>u3-JX6XMSHDf`zoy=x}>D7`m+S>k=;iJT^*X| zm0``!6K^WR(B<}No(g8grIh2Afzm_K2PXd9v2p2|&dia%9bGfTDKB)##P+PM!zwGq zjF%Fo-_YPyo*xo#q0N0~pDUSEHNy;jIW)0UUlts?!qztJ8YKGDVz-?;`uoBaH;2|8 zm--fSNl}~Ib`HO7TXR@f`Hj2WJh!Q(KcTlLYu+IC>;Aj9gYCCg^yq z?U~k_Y};=?a0eATi%Jp9^`N>+v-M!l?CQ3Gn$MeWuFv>tWzLzAyVsMIcWw-PD8!#i n^jH0O_TIyqzb;4LPpW}3FMJ@ctVuo;{ukQ|%dDOGHO>D3CyFW! literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/ic_osmo_light.png b/OsmAnd/res/drawable-hdpi/ic_osmo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..024a0a16a203a105bbd5aa013d8f28c51ffbc575 GIT binary patch literal 1625 zcmbVMc~BEq7>}qN5goPhuDZkvrO9qW&Xvf7EP+shF=R^WNwWJw7DzTEiwV%N7^G7e z)U>rjRK})CRT!$R7owvQM%t=XMx|BpLM=+CUOi?|sn`t?+dmxt=+5lE_r3T1zVG*4 zTcyiN8_k}|X0ceKHR+h1S!ajd=t$;!i{_f*e7aCNd z3l!X!q>Ne}q@tVv67wZI91(~hshlqmOQdq?JCKl(VMGQC5gsB(#fc~)goYk2ONR5sRvvz(i9{14R{vyFh29Xv$@!9FR&iSam2qhqM!v z+ciH_rk7D;z)7wKgxX2jpus$&hq=b3*BUHf@X>?xca>Aq%JxobyU%p3B~x# zqZ2cFV>js^dZ9mdXy-(4=iYhIw#u{OT>s&|W4gBC$sf6IwA_1s@0_CVnsiRPS#YSf ziCE>U3S`d3Kf5Ed4qG2!*A1K29rc8L!#nQrvZ-}vdIpXx8hiW9+mR~*(>9TPx4R=+ zVrF>fbovp@s^j*Bh;W(6iy)tqtO9oZ^0RLGQ##za-SIZ)*Q0AtScovpInk3B!E zAWiJ|+Ktz5JdHs|s)JDud27X(wU_u4dYkH{HN{=*jdQknBbEDanH5o%)hg07J9d=93F5lxij`-vsLNfWm9-;o zj%}{IY>(c;ndqcC_g)Gic4L(AzHLD4iG?`oy*P+%!FlG_EI)==>|4k&@?iavoL|3S!Rar zKtNckme$ZpO`9e@lm{Byr175gL6gR$4>oFI(r6nKQ(X1IK3GV6pa~Jr!Y=wi`rsrp z=ltjV-~WIAZBEB}4_8&zRw4*e73m4~!S&hvyRRI6S2NxXxEwS?17^RLG&6z@5WlR6 z0F9)CVbBKzd2;+V=s*zL2_-&Y4n$w!B`xI=@;WXnm4;{p>F`-;K^g@nDuQ7}^c!$z=+Z_rGx&d-ncY1DseLA>qI*&9vVmiQ$VfMm}>Br7u&YW!+rjk zz|d_KbJUCNkQ#`_(14}`)Z=1tiKG~`jdM{RwvB6h8Kt32knIFb;v~m=+&oF6g$IM) zbUDfQ1;YhjQ1W6UrkUmmB9qCuGH#cq4-*u}aRf;dG>tUn86igXm32B0Ikwhw$k84}oF#Ev2H1^as;*)7W z^Z`Sg&?Q)pWPK3~bN6^hc}2*EKdLLRD8g7!lO|F?H6uYU25(%lBJ+$#mPL_eahhcr zoFf?y=Qx?hSwI1gBr+f=%0)YS;Ylj&rn~7jjtK=QD#Uctp^)E0`dNRtJ;-%?ir9#1 zn1U*SqHhKIE@0WmV)=j$1XI)Fnl@JKg4l>=YQ~6`MgxKEs-w*bMU}OT(ULFIPSio5 zD<^;)*0mJ6oo8OzgM(X^BuNDAIO$2sI3qJG&b4_coFzpd$`mC^0*e*!^8d{r0Z9@0 zX8BL^6pvs>=C`|}0EOLQ0xFy!9gfOif9E2Cl*A)Jf86>>+}zso+3*slZL!4pOBKNv=o_fx)_2#Fu{vUq*uA;JQ^U!JH2zt4v{*(K;Z$@gnzC;!@ z8`X5)YAAV1T)OwnIQaY+`u98ai~Wr?Ga>h1l;i$Nva`7?m*|?VS?GV){$gWO>wB-p z=hkX5yYFOci~GRUr?1a#>~pxgAKlGfs#^#xN1WxCvKw{Wl|No+NX*ZltBdSExXPT2 z%?zEnrIzN-HQa4~Vmh|}mM?4B9G@-UuKwK?u6*#D@B5Drx71!8Y|50bC(u8?`e0%F e>l-g2rFNuBcvzwwUth}q$0DKL;D_Bq^Zx+D4!OGk literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-mdpi/ic_osmo_light.png b/OsmAnd/res/drawable-mdpi/ic_osmo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..e10cc8b01fe8e421555d5800e7c248286f647de9 GIT binary patch literal 1419 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n9DLlB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU&_u!9QqR!T z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1 zy>er{{GxPyLrY6beFGzXBO_g)3fZE`@j@x4_pIZg5^PG@yV%reBd*pl_&Wpr4xy@)uZjaY;}r!Wmdq7l%|9r0NHy z7U!21B?IFlO&O*c7&4a6BsFpIWGChrManjC7v#}N6VsHG zq$D#lT_ZCy6J1LK6H8r7%M>GBvsA-W)8r(R)U>1&m^s+=8yLD78#x&{S(>;y8ydQr zI2pORI+_|dnmM{zxL7)w!t{FP6_+IDC8xsd&IH;G)$52?ua$FAYGO%#QAmD%4lES} zWaO9R7iZ)bC^$QVV_iWbJTosPzr0uz6ipCcyQCInmZhe+73JqDfWz4;6N?*+Q<9UD zlTs~o4NTKgbWKuB%yccyO$~L;43bilQVb1~k`v98p!!qD4L^OLqx3o%vBBR99`m5?Y`ogfLr7e}{$V0wJ; zUhEO=m>)B4?z~xBzWL_emRDbQ38rvMGj5;OmK-_ldiR+o6$$3p2dps-&H)T%%9hhl zn|@_A3}C68@ZbqsZqrAl&$ILPHFC71``X&gxX=cBm_Q;c;G4gx%+yhcO7`cnuH?M8rJo`jz z-L`9{~`o*B)(bLt>Wt~$(6992B{eA!d literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/ic_osmo_dark.png b/OsmAnd/res/drawable-xhdpi/ic_osmo_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..b23be6107fccbafe58855903ca58700acf1ffce4 GIT binary patch literal 1712 zcmbVNc~BE)6c1Na;!&Y0cwh{mP}poXp_ErOJ4E&unA1Y zNfK&!8nXg75KHqcctT!WBAS@14WsoAZWAMxVA7ZX~_T~7=}R}ALR1^S_81=nkbzeFj@V_Ehup- zY9Y)NL7Lc3i#mkNreqwN>FW@TW{u{JVUu+%QFO{cyUq+kTpnmNI^!DEwo>u;uazY$6_p`kv*DcDe)E#VHk>{2rdD5LOliuFo6hw#X<-W@emxr zAP7NqBF-2d`@i`EX;PrGS^m>J<41HyI=62|ffn8j6K$U=|GvI+-1v##xGr99Do z^G_>fgpUASGa z8V_8ottkpBth)G&vEp*fmL1+j-$$K#(!|^NQ(JyR_@mUpA!h!yW81Hk-tX!z?FP|e z;y^}9dt(13bNP+tk-;eI*7~sYa0%mKI$)@*4<2%faIp=DP2qK2`}n@*iKm3GkS@Qf zM)^%*PLpSGsomFq-lN_qzjb2Eb9w!#*0vy3udxR*toS&x>9pTa#F~m=NsVjqhMYc4 zx>pu6t>dqlCEmsB-I&eHJO%K0{bzS2$D~KAe_%b4+qHm^!q|(UDo@HSEHjn%z_K<7s6`Y51(2EX`UU`}}+E34WP-<{zpi zN-IZRCiZ(BY>>4UET6>89_bj~qF!Foy1OU@*r(3x{<2EBz~d(ClHw&aRJi*Y&yZbb ztlW4o@T6ho;j4#Ras$s?cwAFkwYBquvgU6J9~^BiX@BtTNiWfiT;>V>lj~6-$+s#( zSm%FloFg0L<S|@Q(YJBs^3mMO&BmE zbNA;xoAF(OV;lub1 W_-Gg8@TqeCL)5A`<&o(0!hZmLZir0) literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png b/OsmAnd/res/drawable-xhdpi/ic_osmo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..92e58b6366b4513c40732c30f97d8024f70aec78 GIT binary patch literal 1808 zcmbVNc~BE)6i+}ojEpto1y~y*2#U#WZZ{H+kVL42OHi~PY_bci50ZHP7cI(k=@`1VsXW#argo(0XM@2loW(u3X~SAg%i}|&Yoi?O` zCyD4ENX5w`X~CEQrSX`2h7x3PX#$AJ;_(HLU^b0S$N)G8V1o=067o1gkWCwY=!7=| zk|2zh$cB9pl8COtalH@#%w{vw%wb}NM1TcB5CF0PHk(0cFpSAM9JVlY#_1y#B&bno zQ0s9urlZ*`!V1iUi|7Q?4)UkA&$XU?O*)cVtr}*a#yGYN9BxMuI6#T2zOJNaa!Y>rqa zknn?K0tga}U_*6A9M&n(5#MUU_b?XxELIq7Kw%s+#9)|aqzfWd7>*fLn4T6KJXCd> z&my%B!OX^)wlaN)T7nwXt58H{z_hfXJPXyI;J`tYN~Hpw!vJ{+2!o4o`3y+FV=?%k z0#zU^mO=^h>BD&B|K<-MNCCEH`A_qV91$I9+kPAcLijjLsE(K*12HOddpcGU69|S% zf?_Opp5}j(C6Ag?e>pEN2Lif^bH;A_^&HsfGY#={Zr|i1&2!uTSHTOgEnUK`r_>iW zdL2Jy@i53;E>dRJedl@HaZh9ytA0&;fa%)1mOq{tj^#Z}efgxIWy$IzF9Y7(ZGCk_ zw7vOJ@5Xcux{<8&B72cDmjy~AmBPY)mYLdY-&B(dPRxmKb?ljN&tdZ5A(sueHT)B# zaqcVZm(=2L^PIh-boN_nboyCgA?3>sI^gNs^DjE)xvkE)+42@3Uyyh8{Dy8mIm0+W zy+SHm8#V2rTVu7`pHz^%lr(dTnNtTHZu>$%HRo#ItF>dTwVO%?MCbe)uNTy3Gvd8e z6JDRryjT=24bt_yKZbXA-aTI))Y8Dqo>3%My(jO?m^x5Wz5L~uc1^VraC5)H+3MW6 z&VPq9=GJT~WKKjXs&<;mzFhw`w-o*+?`dvj?Vf?zH|7Q3lO1inpY>o#xLtAB>KpK- zru9jX^VV%Gz8jz)ouBPXqa1uuP<6KS+AdP8x-8+P&*I8+GH=SWuhN{XloPeCU=&AJ zp1Iab{Dv}_+_spBFOXP|9QRAi&2$mBirmSuez|_+CmsG#rIWaeom2^%CLn^G&AIpw zN%8q5zI`|Rqbi=$uQ2=493IKL124h7X;E!dN@ey|PBLfyBagGz@SeJunzLD5qqKTQduCUj>Sk5erR&0O%}-bV zCTqJNQ%&!SQ%xNmKH?XhPJ{3-=KG{^uJTjuogQ}%uiUk8{pGJCb_YQS@?COTtK-aX&r5$VR*C*`_+jA)K@J-yl%#NP{ zw90i@lZF+j z!m77eZ+U~Wix~ZLfzjq*=RsY(H~M zClO~=&?Eur1F0xUI8lgbVIqgdrOFvhHgPRLV{*7_fwdGO3zO*#9-YOYG5|iuo6leo zKVBrvn-)^=BSe88ePNP-lz^fdKAoPPo=!{mrXkvRIuif@I)g=Lv8b2^RhOYgK|NKi zbDOguf^~AOQiCcHHF3rwC__?F0SROJAq161BKc%kt^1fLEM;^(sG&1y47y4+6W6S^ z4vm2SOXIWJI%$Rmrboa!BvmWN>Y;F(17o@Sb4N3Z7#n_=R*4k_Oco*XR28g7#UcR- z`$B`15TDI~AeoHIrLwqOHWgs70V)7MEGidf!W_Ab4J%~OoSo0%MF9aU7O>V2U< zqDw$DM4@oD>clmhm1+n{*O6z+^dV{ytW~DLP@oo35ohzvSAK?rHzb$KWiXG*;3yy} z8)9>*z*-KI%4Nu48N_7Dg#@FzW-p})uJqY-79<10sFTT4>n#k#-1q9dptUrSR9))@@&<-pzbzWPP z{HgYPUv-sw#~Xf$XUS@g7LFn49`^!#;p}Zg-?6LXl=XnKW;xH!*-Vl1_A-4SeT>tM zyKnwe4nYMRUU&%hb)i^n&NXs=NAO`^-x>Ie@z}u)X6JA|Hl~*L^0H|!#=qs^ZdHVO z%Rc<1sUzE|-m%Zpbh5|63m=vjxuW}`172bz1%=?uL zJ$LRUJasU_(~G*j8jD}7t}nQf8*VMSS?c86g10R+D!vYDVl^k6=bvy5^=@H%0a5KI zN^ZQ}`{2Qy%*$CDMhsAc|H65ysbwvhR$iAw!1uS+iwz_5HgzUdufUt$Xx{L6;s5N~ z;Jdx>uS$k8vV8gR+7)s6t|i5N20X{lhHdqS2a48$y(Rf+*|i4i>DreEVlC1f>rR`c zJDGkdnJ%V;C*^G&Rt5<=jla#)P=1O!d9dx_0oRpJV>4bW<#>rhfw1bFduaU8YGDVh z=xwTJ2gN02zeKtKX-vLrE^({_EZ$X9ItZo*`O34F%e@kGcW!kJCZ2oOV;}tDj|-23 ziMz{u?wZ5aJ(p744_pm3J%(dD!M|Nuks0x>d#T^{d@;rG`WJPthZ76;jZ_{T8vJJ6 zq6E=Wd_`5Np>Xx}6Bqi)`|*dmmFGO{H^Fy*&^N~!Z=#Q4g3QHFd`zzP0d3Mr0p6~Y zmrXvZ+)^5X(THAU={Yc3XIEM}R7W{a2`BfC`v(I6K$rniK52i zx&O+{stDh}%2mAZIU`lHafSNAo<_eM-ma}Tc{kjQ-x9J4@8v(-E6cyJx8l2+E6nL~ zXYB>ol-8X?l}VDJ%92C%W2^T4cnv23trDah8_E3JCtX7p)GvP0@^W==YR#AXE_T~R zrq);)BJ;l_XKefZxkXn}L5O1}KE~{e9H4Kz-TQ{zY@}=S=VNbKqz>-!TfK4P>))*D zykzf`pvXQ#&Pn*bPaHQ!jj~Fc7>(aQjB<8!Cxw4^sM19l2H={X8#JARv588sAKD))>%zf)1+?PwrLc@E!Hw?grzppG?TIYmR=aCJ;`+vT$U z#PG5+h9XgRprv?t9$2 zOD}$9`Lh4y)OX-(N{mg<@gniq^nw#pTQZ2zwoX+`D)~}=5wWK!X5;vj<-2RCOTyaE zS5C~Y*kfoJU;MN`>qWn(@BKs1+(sL=47=r!a!4Zc0P|&yE@oD^n#pAHVMc!9%#VXO LAXIeLKQ8w_20eXb literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png b/OsmAnd/res/drawable-xxhdpi/ic_osmo_light.png new file mode 100644 index 0000000000000000000000000000000000000000..bab4f8f08f7f2d09838ae0cbbde9306458ee2b94 GIT binary patch literal 2344 zcmbVOX;c$g7LG_Fi_EZ1P)0OF1VOTr1QG~q5<%HIfYJ&|k}4rUQXwfIC?LUhm!&~z zko6$AbSugM0W|`m(xW{pHmK0JfO=FEk*$NQPDR0)AD;d(^-k5h@4fro`@OrIQwM_s z*BcpF8lX@pBR^jbADMl%uO0^ZhP|&_k4(#9Za5qQ?SPX7auDSOKtd4bClN%0d{6+S zB-{esP^iU8;?Qt7JiwnNf+R$NR)?sR$PhFN<>sN32}E%qj1z**N(J`2pd+AT#O_|5YK@`i4sr>`*GNK z&%zc`ky`O+u3 z4w56S;@0qJ1qy}s_2YPjD*qUah>XW_%}cS~=lEn_d}Zhlhd!F!Y~3>zWloPxC2u&Z zsx;}c$ZD?&?$T?wtgmNK=G>M~XJEVbW73RQ>8bDE$mrr6$-rfP*P7drIn&i~Pf>Tu zue0lk>lN3r_nO}PlH8%EMXtM&qBVD~PJb8XaLixzX?>!#mv!)$kwl>k0t$tK*$$gE zEsM~*yChnbf9*_^hZ5svFsCzwY24#sm(bnQvpfiwQ)pD9TinXDP71m8%Qe^5XyuG? zw^5R6|F50qaVY1^C9M}tp8p{DTkoo<-9{-EZ%l^?!*;`G%*$UM91NP0RF^;2huPhR zHH+g`OrGvHd$4i$C6hN^GK;3x{1){1MDR-8ojNm^lIN2r544;g@Tk+d6*sMr@rxd+ z{l;5d4(r^q>Lp=xjmYAkB|`ts8&MP`+Dz8+N<64XQ>iTSD&-AP@A17?fS`1Q;y|2$5QJ0}rmde^Ka9x0_GO&j?$hZ*M zxc59(LLT5(YywL{o@e~D$4)fGx}}NhF1HPgC7kk9T;o-ra~raP?q;rE;6x@#%)Pnz9#v zI&`qH3E3NAd#LqlGkQzag@Ib-v0ra8rw+DxKht?qaiQmxcvmf9KpCl5_5JSjahu%s zpsSF|c3u43uvRXGRJ6&mML{}7Hdas~cF8gPTXV*#G<|q=Q&`H#Bc*A~Cai8=#GPGH z<@aBwLt_Z$-iI39Jk#F{ZBKLk^dH)al;w6RTDs>$GF*EE3uwUZ5A-3$;_#S7ri@bVLX938`f<_F&B*$puUaF%P+Y7y1uaaWNq4#>BDX48kOxC zPbcBhO{3&@0mIedSGZSfpWeqFHm)epEIHO0yUgmyGgHIy;=P@w7VI;r&5P!)4|GOP zYJRjIwflHRU*0~(i{E~7_(QeZCyV!zr~A^>s<$yNOZg|$Lhj#NX=ZbK*Lo`tD0B4o zM0?GQqlG%p-)wfpy%fow*qbMo6~K9}YuEH~MF*UY%=W$LtFR|wnAx+8tV-QHvAj|L zt-sHSp&L8hhaykh%|cI_CZ;UsT2_5}pTH&I}T)%L4119_d6zJ2t=4X?~Hu;r6xbEe~>8y|Huq^uv?9(vq!|IsAV4y$t<6~iI^<$CBt@saD*o?E@|PB=ZEZRDf#G6HWm zk8aH}Tb;e}=a*Zh_=&<5t)LD2MmO*G6^-Nv);(&G{**eV%_F#_u<_i!e%gk2VrG2X zZg-hY&{iXh?z6s$q4l00j^h$tu}PL`VTq3oV63`)B!BQ3W)fPLQy$PO2pjPT&N^>* h+IW6c4ws`Aqw=;*=Ug}IJFNY8@#6+^YP_Q|{{v$j&I$kk literal 0 HcmV?d00001 From 1b108029e4f2a664300e0e19f199170aaec24724 Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Mon, 5 Jan 2015 16:02:59 +0100 Subject: [PATCH 236/372] Translated using Weblate (Catalan) Currently translated at 40.9% (250 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 39 ++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 1158962877..208478fbcd 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -230,17 +230,42 @@ Molí de vent Veterinari Medicina alternativa - Audiòleg + Audiologia Banc de sang Centre mèdic Llevadora - Terapeuta ocupacional - Optometrista - Fisioterapeuta - Podòleg - Psicoterapeuta + Teràpia ocupacional + Optometria + Fisioteràpia + Podologia + Psicoteràpia Rehabilitació - Logopeda + Logopèdia Serveis mèdics + Empresa + Agència d\'assegurances + Immobiliària + Gabinet d\'advocats + Empresa de telecomunicacions + ONG + Ajuntament + Oficina d\'ocupació + Oficina de recerca i desenvolupament + Consultoria en TIC + Gabinet d\'arquitectura + Agència de publicitat + Estudi de gravació, ràdio o TV + Casa d\'apostes + + Estadi + Poliesportiu + Camp de golf + Pista de gel + Camp d\'esports + Pista esportiva + Pista d\'atletisme + Pista de ciclisme + Pista d\'equitació + Circuit de carreres From 238b886ea6a1573da9aa34c13d7885dd3ebe4ec1 Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 5 Jan 2015 13:08:04 +0200 Subject: [PATCH 237/372] Fixed bug with MapFragment sets image in wrong thread. --- .../net/osmand/plus/dashboard/DashMapFragment.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java index a7a5b8b8f5..b4527e4c28 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashMapFragment.java @@ -78,10 +78,16 @@ public class DashMapFragment extends DashBaseFragment implements IMapDownloaderC if (view == null) { return; } - Bitmap image = getMyApplication().getResourceManager().getRenderer().getBitmap(); - ImageView map = (ImageView) view.findViewById(R.id.map_image); + final Bitmap image = getMyApplication().getResourceManager().getRenderer().getBitmap(); + final ImageView map = (ImageView) view.findViewById(R.id.map_image); if (image != null) { - map.setImageBitmap(image); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + map.setImageBitmap(image); + } + }); + } } From 7ec0c9f3a63236531a23e7851cb69439c583871d Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 5 Jan 2015 13:29:55 +0200 Subject: [PATCH 238/372] Fixed NPE in DashDownloadMapFragment --- OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java | 3 +++ .../net/osmand/plus/dashboard/DashDownloadMapsFragment.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java index f6411de761..9a4fe6a4b2 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java @@ -9,6 +9,9 @@ import net.osmand.plus.OsmandApplication; public class DashBaseFragment extends SherlockFragment { public OsmandApplication getMyApplication(){ + if (getActivity() == null){ + return null; + } return (OsmandApplication) getActivity().getApplication(); } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java index a34bce2a2e..0f67c08a45 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashDownloadMapsFragment.java @@ -84,7 +84,8 @@ public class DashDownloadMapsFragment extends DashBaseFragment { } protected void updateCount(String s) { - if (!DashDownloadMapsFragment.this.isAdded()){ + if (!DashDownloadMapsFragment.this.isAdded() || + getMyApplication() == null){ return; } File ms = getMyApplication().getAppPath(s); @@ -104,7 +105,8 @@ public class DashDownloadMapsFragment extends DashBaseFragment { @Override protected void onPostExecute(Void result) { super.onPostExecute(result); - if (!DashDownloadMapsFragment.this.isAdded()){ + if (!DashDownloadMapsFragment.this.isAdded() + || getMyApplication() == null){ return; } if(countMaps > 0) { From ea32f71f8761a7b9681d49108712d77797a9b099 Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 5 Jan 2015 13:32:18 +0200 Subject: [PATCH 239/372] Fixed NPE in DashUpdatesFragment --- .../src/net/osmand/plus/dashboard/DashUpdatesFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java index 660bad87d2..ca82f99671 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashUpdatesFragment.java @@ -143,9 +143,10 @@ public class DashUpdatesFragment extends DashBaseFragment { //needed when rotation is performed and progress can be null if (!updateOnlyProgress) { getProgressIfPossible(basicProgressAsyncTask.getDescription()); - if (currentProgress == null) { - return; - } + } + + if (currentProgress == null) { + return; } if (updateOnlyProgress) { From 67fb13c57170daed7c7eaef1391700206d3ac944 Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 5 Jan 2015 15:59:41 +0200 Subject: [PATCH 240/372] Small fix to Deactivate operation --- OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java index 107e5d1ea5..86ebacc93d 100644 --- a/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java +++ b/OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java @@ -841,6 +841,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment { } } listAdapter.notifyDataSetChanged(); + expandAllGroups(); } public void cancelFilter(){ From 525b5ea3a3658c12163c4d7b1b5299b8532d9673 Mon Sep 17 00:00:00 2001 From: Denis Date: Mon, 5 Jan 2015 17:11:46 +0200 Subject: [PATCH 241/372] Changed icon for osmo in main menu --- OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java index a54a64b868..0d4cd6f654 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java @@ -333,7 +333,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer @Override public void registerOptionsMenuItems(final MapActivity mapActivity, ContextMenuAdapter helper) { - helper.item(R.string.osmo_groups).icons(R.drawable.ic_action_eye_dark, R.drawable.ic_action_eye_light).position(6) + helper.item(R.string.osmo_groups).icons(R.drawable.ic_osmo_dark, R.drawable.ic_osmo_light).position(6) .listen(new OnContextMenuClick() { @Override public boolean onContextMenuClick(ArrayAdapter adapter, int itemId, int pos, boolean isChecked) { From aef5fab1b9e21951b741b4390346b7d1fe630ccd Mon Sep 17 00:00:00 2001 From: Konfrare Albert Date: Mon, 5 Jan 2015 16:46:39 +0100 Subject: [PATCH 242/372] Translated using Weblate (Catalan) Currently translated at 46.4% (284 of 611 strings) --- OsmAnd/res/values-ca/phrases.xml | 36 +++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/phrases.xml b/OsmAnd/res/values-ca/phrases.xml index 208478fbcd..bdd015ab63 100644 --- a/OsmAnd/res/values-ca/phrases.xml +++ b/OsmAnd/res/values-ca/phrases.xml @@ -233,7 +233,7 @@ Audiologia Banc de sang Centre mèdic - Llevadora + Infermeria obstètrico-ginecològica Teràpia ocupacional Optometria Fisioteràpia @@ -268,4 +268,38 @@ Pista de ciclisme Pista d\'equitació Circuit de carreres + Bitlles americanes + Tir amb arc + Atletisme + Futbol americà + Futbol australià + Salt BASE + Beisbol + Basquetbol + Voleibol de platja + Bicicròs + Joc de botxes + Futbol canadenc + Escacs + Escalada + Criquet + Croquet + Ciclisme + Salts + Submarinisme + Curses de gossos + Hípica + Golf + Gimnàstica + Handbol + Hoquei + Curses de cavalls + Patinatge sobre gel + Icestock + Corfbol + Esport de motor + Cursa d\'orientació + Pàdel + Parapent + Joc de pilota From e50e70a9f6e6bfefce974157a93ea2c52c842b09 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 20:42:25 +0100 Subject: [PATCH 243/372] More debugging to check out the route recalculating behavior if route points change with an origin set other than "current position" --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index b73fa2394e..82b29a759a 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -75,10 +75,12 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio if(selectFromMapTouch) { LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); selectFromMapTouch = false; - //TODO: Hardy: Looks like there is a small bug here somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to (sometimes?) only interrupt the ongoing route calculation, but not restart it again with the new points if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); } else { + //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) + //So let's see if we can trigger route-recalculation duing an ongoing calculation by the inserting the following line + getTargets().clearStartPoint(true); getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); From c3af5fd7766304806d22b88ef480920ab5385d3d Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 5 Jan 2015 18:39:08 +0100 Subject: [PATCH 244/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-be/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index d2c6c08a21..20a0b93d21 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -753,7 +753,10 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Вэб-адрас для сеткавага сачэньня Калі ласка, дазвольце \'Запіс сьледу ў GPX файл\' у наладах. Паказаць бягучы сьлед - Зьмены ў 0.7.0: \n\t- Пазасеткавыя зьвесткі вікіпэдыі з артыкуламі \n\t- Абноўленыя мапы \n\t- Іншыя невялікія пашырэньні + "Зьмены ў 0.7.0: +\n\t- Пазасеткавыя зьвесткі вікіпэдыі з артыкуламі +\n\t- Абноўленыя мапы +\n\t- Іншыя невялікія пашырэньні " Гэтая бясплатная версія OsmAnd абмяжоўваецца %1$s загрузкамі і не падтрымлівае аўтаномныя артыкулы Вікіпедыі. Бясплатная вэрсія Паказваць апісаньні POI From 4498c550861771fdde6b4b23e5edea7ddaba0093 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 5 Jan 2015 20:37:11 +0100 Subject: [PATCH 245/372] Translated using Weblate (Belarusian) Currently translated at 96.3% (589 of 611 strings) --- OsmAnd/res/values-be/phrases.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index 8ed6c0335a..3ee7fa85e2 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -617,4 +617,10 @@ Скала Сухі док Плывучы док + Вежа + Шчогла + Радар + Акварыюм + Буй (ізаляваная небясьпека) + Латэральны буй From a300d596d951dbaded68a9cb10a74f7441d62b45 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 21:21:00 +0100 Subject: [PATCH 246/372] see how this changes the behavior --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 82b29a759a..58779ae196 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -79,8 +79,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().navigateToPoint(latlon, true, -1); } else { //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) - //So let's see if we can trigger route-recalculation duing an ongoing calculation by the inserting the following line - getTargets().clearStartPoint(true); + //So let's see if we can trigger route-recalculation during an ongoing calculation by the inserting the following line + getTargets().clearStartPoint(false); getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); From e9843f88179cc4adf749e30f31245c6d0fb982aa Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 5 Jan 2015 21:17:17 +0100 Subject: [PATCH 247/372] Translated using Weblate (Belarusian) Currently translated at 98.6% (603 of 611 strings) --- OsmAnd/res/values-be/phrases.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index 3ee7fa85e2..c30b1ba3ee 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -594,9 +594,9 @@ Гавань Прычал Апавяшчэньне (навігацыйны знак) - Радыёстанцыя + Радыёстанцыя (навігацыйны знак) Сыгнал небясьпекі - Караблекрушэньне + Караблекрушэньне (навігацыйны знак) Ваенная зона Ваенны аэрадром @@ -614,7 +614,7 @@ Амэрыканскія горкі Жолаб Летнія сані - Скала + Скала (навігацыйны знак) Сухі док Плывучы док Вежа @@ -623,4 +623,18 @@ Акварыюм Буй (ізаляваная небясьпека) Латэральны буй + Дамба + Кардынальны бакен + Латэральны бакен + Кардынальны буй + Радыёлакацыйны транспондар (навігацыйны знак) + Навігацыйны знак на палях + Сігнальная станцыя (трафік) + Топавая фігура (навігацыйны знак) + Будынак (арыентыр) + Мост (арыентыр) + Бясьпечная вада (буй) + Бясьпечная вада (бакен) + Акваторыя порту + Берагавы знак From e824f298cfd0e6986150723a91d739daf775a2f9 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 21:49:30 +0100 Subject: [PATCH 248/372] revert test build --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 58779ae196..d0c6574533 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -79,8 +79,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().navigateToPoint(latlon, true, -1); } else { //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) - //So let's see if we can trigger route-recalculation during an ongoing calculation by the inserting the following line - getTargets().clearStartPoint(false); getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); @@ -180,7 +178,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } else if(position == 1) { selectFavorite(parentView, false); } else if(position == 2) { - selectOnScreen(parentView, false); + (parentView, false); } } From f29ed1f6ca9b89085133ec950ecea0ef183d7448 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 5 Jan 2015 21:48:32 +0100 Subject: [PATCH 249/372] Translated using Weblate (Belarusian) Currently translated at 99.8% (610 of 611 strings) --- OsmAnd/res/values-be/phrases.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index c30b1ba3ee..ce62bca19c 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -637,4 +637,11 @@ Бясьпечная вада (бакен) Акваторыя порту Берагавы знак + Агонь маяка + Дзённы знак + Асноўны агонь маяка + Малы агонь маяка + Агонь плывучага маяка + Пазнака дальнасьці + Агонь плывучага маяка (судна) From 0a2c81d8507bbde2ee3080b85bda0a529c70c3b7 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Mon, 5 Jan 2015 21:52:06 +0100 Subject: [PATCH 250/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (611 of 611 strings) --- OsmAnd/res/values-be/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index ce62bca19c..7c2318db2f 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -644,4 +644,5 @@ Агонь плывучага маяка Пазнака дальнасьці Агонь плывучага маяка (судна) + Лодкавая станцыя From 155f6baaa1669230532e70413e1b14243b465fe9 Mon Sep 17 00:00:00 2001 From: sonora Date: Mon, 5 Jan 2015 22:01:40 +0100 Subject: [PATCH 251/372] correct accidental deletion --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index d0c6574533..f0780d3b95 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -178,7 +178,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } else if(position == 1) { selectFavorite(parentView, false); } else if(position == 2) { - (parentView, false); + selectOnScreen(parentView, false); } } From 199118aa5822caa6e66ac1e3719914d488669107 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 00:29:48 +0100 Subject: [PATCH 252/372] take a shot at the screen rotation correction --- .../activities/search/SearchPOIActivity.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 2bef3c618f..a784bc3137 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -781,8 +781,24 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa //TODO: Hardy: The arrow direction below is correct only for the default display's standard orientation // i.e. still needs to be corrected for .ROTATION_90/180/170 - // Keep in mind: getRotation was introduced from Android 2.2 - draw.setAngle(mes[1] - a + 180); + //TODO: API<8 use getOrientation() here + int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + private static final int ORIENTATION_0 = 0; + private static final int ORIENTATION_90 = 3; + private static final int ORIENTATION_270 = 1; + switch (screenOrientation) + { + case ORIENTATION_0: // Portrait + screenOrientation = 0; + break; + case ORIENTATION_90: // Landscape right + screenOrientation = 90; + break; + case ORIENTATION_270: // Landscape left + screenOrientation = 270; + break; + } + draw.setAngle(mes[1] - a + 180 + screenOrientation); draw.setOpenedColor(opened); direction.setImageDrawable(draw); From df88eb4d28b4ecaf34ad2da03da4094046cae215 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 00:37:58 +0100 Subject: [PATCH 253/372] move declarations up --- .../plus/activities/search/SearchPOIActivity.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index a784bc3137..88318e8765 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -108,6 +108,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa private static final int SHOW_ON_MAP = 1; private static final int FILTER = 2; + private static final int ORIENTATION_0 = 0; + private static final int ORIENTATION_90 = 3; + private static final int ORIENTATION_270 = 1; + private PoiFilter filter; private AmenityAdapter amenityAdapter; private EditText searchFilter; @@ -779,13 +783,9 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa Float h = heading; float a = h != null ? h : 0; - //TODO: Hardy: The arrow direction below is correct only for the default display's standard orientation - // i.e. still needs to be corrected for .ROTATION_90/180/170 - //TODO: API<8 use getOrientation() here + //TODO: Hardy: The arrow direction below is needs orrection for screen rotation if device's screen orientation switch is on (then correct only for the default display's standard orientation) + //TODO: Instead of getRotation() in API<8 use getOrientation() here: int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); - private static final int ORIENTATION_0 = 0; - private static final int ORIENTATION_90 = 3; - private static final int ORIENTATION_270 = 1; switch (screenOrientation) { case ORIENTATION_0: // Portrait From 485e947f023579c0604d32f516b4fc46e393aacf Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 01:36:28 +0100 Subject: [PATCH 254/372] amend comments --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 88318e8765..5a0cd24724 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -783,8 +783,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa Float h = heading; float a = h != null ? h : 0; - //TODO: Hardy: The arrow direction below is needs orrection for screen rotation if device's screen orientation switch is on (then correct only for the default display's standard orientation) - //TODO: Instead of getRotation() in API<8 use getOrientation() here: + //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation + //TODO: getOrientation() needs to be used for API<8, deprecated after that int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) { From 8966b88a795720371142857bfb1ff5d159f14e2a Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 01:41:22 +0100 Subject: [PATCH 255/372] Port orientation correction also to DashFavoritesFragment --- .../plus/dashboard/DashFavoritesFragment.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 2dd93a97b3..e2c9cc0eb9 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -10,6 +10,7 @@ import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; @@ -39,6 +40,11 @@ public class DashFavoritesFragment extends DashBaseFragment { private net.osmand.Location location = null; private LatLon loc = null; private Float heading = null; + + private static final int ORIENTATION_0 = 0; + private static final int ORIENTATION_90 = 3; + private static final int ORIENTATION_270 = 1; + private List arrows = new ArrayList(); List points = new ArrayList(); @@ -176,10 +182,22 @@ public class DashFavoritesFragment extends DashBaseFragment { Float h = heading; float a = h != null ? h : 0; - //TODO: Hardy: The arrow direction below is correct only for the default display's standard orientation - // i.e. still needs to be corrected for .ROTATION_90/180/170 - // Keep in mind: getRotation was introduced from Android 2.2 - draw.setAngle(mes[1] - a + 180); + //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation + //TODO: getOrientation() needs to be used for API<8, deprecated after that + int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + switch (screenOrientation) + { + case ORIENTATION_0: // Portrait + screenOrientation = 0; + break; + case ORIENTATION_90: // Landscape right + screenOrientation = 90; + break; + case ORIENTATION_270: // Landscape left + screenOrientation = 270; + break; + } + draw.setAngle(mes[1] - a + 180 + screenOrientation); direction.setImageDrawable(draw); } From 062e6f7cf56b97f9a006810f149d58be888f84d9 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 01:54:42 +0100 Subject: [PATCH 256/372] import Context --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index e2c9cc0eb9..0419b05673 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -1,6 +1,7 @@ package net.osmand.plus.dashboard; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.graphics.drawable.Drawable; From e21853b161d313f96e66790d37bbcebafd58465a Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 02:06:06 +0100 Subject: [PATCH 257/372] fix build for now --- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 0419b05673..47a64feecc 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -185,7 +185,8 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that - int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + //int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + int screenRotation switch (screenOrientation) { case ORIENTATION_0: // Portrait From 6c20fd5bdf0e6b7793c20fcd83ab436d58668367 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 02:12:41 +0100 Subject: [PATCH 258/372] fix typo --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 47a64feecc..736fc5c85b 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -186,7 +186,7 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that //int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); - int screenRotation + int screenRotation; switch (screenOrientation) { case ORIENTATION_0: // Portrait From 8a37d68ee6a055b5fea665dd395e5ff43203ceb6 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 02:17:21 +0100 Subject: [PATCH 259/372] try getContext() --- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 736fc5c85b..bae12e7653 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -185,8 +185,7 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that - //int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); - int screenRotation; + int screenOrientation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) { case ORIENTATION_0: // Portrait From bdbfd8cdc6b8de0cb7a28f35622f76e2ecc3e64c Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 02:21:40 +0100 Subject: [PATCH 260/372] fix build for now --- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index bae12e7653..ef99c47e40 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -185,7 +185,8 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that - int screenOrientation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + //int screenOrientation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + int screenOrientation = 0; switch (screenOrientation) { case ORIENTATION_0: // Portrait From c7cff599c08129555784035b90e995d7cd7e6c92 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 08:06:25 +0100 Subject: [PATCH 261/372] refactor slightly --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 3 ++- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 5a0cd24724..b0a3f93836 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -785,7 +785,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that - int screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + int screenOrientation = 0; + screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) { case ORIENTATION_0: // Portrait diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index ef99c47e40..05d523bade 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -185,8 +185,8 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that - //int screenOrientation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); - int screenOrientation = 0; + int screenOrientation = 0; + //screenOrientation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) { case ORIENTATION_0: // Portrait From a60cd2a83565d5ce10cc61d460bc96a54102524d Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 08:37:17 +0100 Subject: [PATCH 262/372] simplifiy code --- .../activities/search/SearchPOIActivity.java | 18 +++--------------- .../plus/dashboard/DashFavoritesFragment.java | 18 +++--------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index b0a3f93836..fd68efb379 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -108,9 +108,9 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa private static final int SHOW_ON_MAP = 1; private static final int FILTER = 2; - private static final int ORIENTATION_0 = 0; - private static final int ORIENTATION_90 = 3; - private static final int ORIENTATION_270 = 1; + private static final int ORIENTATION_0 = 0; // Portrait + private static final int ORIENTATION_90 = 90; // Landscape right + private static final int ORIENTATION_270 = 270; // Landscape left private PoiFilter filter; private AmenityAdapter amenityAdapter; @@ -787,18 +787,6 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa //TODO: getOrientation() needs to be used for API<8, deprecated after that int screenOrientation = 0; screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); - switch (screenOrientation) - { - case ORIENTATION_0: // Portrait - screenOrientation = 0; - break; - case ORIENTATION_90: // Landscape right - screenOrientation = 90; - break; - case ORIENTATION_270: // Landscape left - screenOrientation = 270; - break; - } draw.setAngle(mes[1] - a + 180 + screenOrientation); draw.setOpenedColor(opened); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 05d523bade..b44628e811 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -42,9 +42,9 @@ public class DashFavoritesFragment extends DashBaseFragment { private LatLon loc = null; private Float heading = null; - private static final int ORIENTATION_0 = 0; - private static final int ORIENTATION_90 = 3; - private static final int ORIENTATION_270 = 1; + private static final int ORIENTATION_0 = 0; // Portrait + private static final int ORIENTATION_90 = 90; // Landscape right + private static final int ORIENTATION_270 = 270; // Landscape left private List arrows = new ArrayList(); List points = new ArrayList(); @@ -187,18 +187,6 @@ public class DashFavoritesFragment extends DashBaseFragment { //TODO: getOrientation() needs to be used for API<8, deprecated after that int screenOrientation = 0; //screenOrientation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); - switch (screenOrientation) - { - case ORIENTATION_0: // Portrait - screenOrientation = 0; - break; - case ORIENTATION_90: // Landscape right - screenOrientation = 90; - break; - case ORIENTATION_270: // Landscape left - screenOrientation = 270; - break; - } draw.setAngle(mes[1] - a + 180 + screenOrientation); direction.setImageDrawable(draw); From a06f5454efb39041bff2497c28c28dfb3fdbc7fb Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 08:51:17 +0100 Subject: [PATCH 263/372] try getActivity() --- .../activities/search/SearchPOIActivity.java | 18 ++++++++++++++--- .../plus/dashboard/DashFavoritesFragment.java | 20 +++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index fd68efb379..b0a3f93836 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -108,9 +108,9 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa private static final int SHOW_ON_MAP = 1; private static final int FILTER = 2; - private static final int ORIENTATION_0 = 0; // Portrait - private static final int ORIENTATION_90 = 90; // Landscape right - private static final int ORIENTATION_270 = 270; // Landscape left + private static final int ORIENTATION_0 = 0; + private static final int ORIENTATION_90 = 3; + private static final int ORIENTATION_270 = 1; private PoiFilter filter; private AmenityAdapter amenityAdapter; @@ -787,6 +787,18 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa //TODO: getOrientation() needs to be used for API<8, deprecated after that int screenOrientation = 0; screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + switch (screenOrientation) + { + case ORIENTATION_0: // Portrait + screenOrientation = 0; + break; + case ORIENTATION_90: // Landscape right + screenOrientation = 90; + break; + case ORIENTATION_270: // Landscape left + screenOrientation = 270; + break; + } draw.setAngle(mes[1] - a + 180 + screenOrientation); draw.setOpenedColor(opened); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index b44628e811..298820d590 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -42,9 +42,9 @@ public class DashFavoritesFragment extends DashBaseFragment { private LatLon loc = null; private Float heading = null; - private static final int ORIENTATION_0 = 0; // Portrait - private static final int ORIENTATION_90 = 90; // Landscape right - private static final int ORIENTATION_270 = 270; // Landscape left + private static final int ORIENTATION_0 = 0; + private static final int ORIENTATION_90 = 3; + private static final int ORIENTATION_270 = 1; private List arrows = new ArrayList(); List points = new ArrayList(); @@ -186,7 +186,19 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that int screenOrientation = 0; - //screenOrientation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + screenOrientation = ((WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); + switch (screenOrientation) + { + case ORIENTATION_0: // Portrait + screenOrientation = 0; + break; + case ORIENTATION_90: // Landscape right + screenOrientation = 90; + break; + case ORIENTATION_270: // Landscape left + screenOrientation = 270; + break; + } draw.setAngle(mes[1] - a + 180 + screenOrientation); direction.setImageDrawable(draw); From 9fa44e141901d380260277ad3d46ecc40248d848 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 09:04:14 +0100 Subject: [PATCH 264/372] cover also upside-down case --- .../osmand/plus/activities/search/SearchPOIActivity.java | 6 +++++- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index b0a3f93836..b0c19a1106 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -111,6 +111,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa private static final int ORIENTATION_0 = 0; private static final int ORIENTATION_90 = 3; private static final int ORIENTATION_270 = 1; + private static final int ORIENTATION_180 = 2; private PoiFilter filter; private AmenityAdapter amenityAdapter; @@ -789,7 +790,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) { - case ORIENTATION_0: // Portrait + case ORIENTATION_0: // Device default (normally portrait) screenOrientation = 0; break; case ORIENTATION_90: // Landscape right @@ -798,6 +799,9 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa case ORIENTATION_270: // Landscape left screenOrientation = 270; break; + case ORIENTATION_180: // Upside down + screenOrientation = 180; + break; } draw.setAngle(mes[1] - a + 180 + screenOrientation); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 298820d590..ba07f3fc04 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -45,6 +45,7 @@ public class DashFavoritesFragment extends DashBaseFragment { private static final int ORIENTATION_0 = 0; private static final int ORIENTATION_90 = 3; private static final int ORIENTATION_270 = 1; + private static final int ORIENTATION_180 = 2; private List arrows = new ArrayList(); List points = new ArrayList(); @@ -189,7 +190,7 @@ public class DashFavoritesFragment extends DashBaseFragment { screenOrientation = ((WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) { - case ORIENTATION_0: // Portrait + case ORIENTATION_0: // Device default (normally portrait) screenOrientation = 0; break; case ORIENTATION_90: // Landscape right @@ -198,6 +199,9 @@ public class DashFavoritesFragment extends DashBaseFragment { case ORIENTATION_270: // Landscape left screenOrientation = 270; break; + case ORIENTATION_180: // Upside down + screenOrientation = 180; + break; } draw.setAngle(mes[1] - a + 180 + screenOrientation); From 41ff4fd5e97ff74cc93740a2101c32995e7fada5 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 10:35:00 +0100 Subject: [PATCH 265/372] comment arrow initialization fix for non-compass devices --- .../src/net/osmand/plus/activities/search/SearchPOIActivity.java | 1 + OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 1 + 2 files changed, 2 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index b0c19a1106..175ad01bb1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -513,6 +513,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa @Override public void updateCompassValue(float value) { + //99 in next line used to one-time initalize arrows (with reference vs. fixed-north direction) on non-compass devices float lastHeading = heading != null ? heading : 99; heading = value; if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index ba07f3fc04..e783eb9869 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -211,6 +211,7 @@ public class DashFavoritesFragment extends DashBaseFragment { public void updateCompassValue(float value) { //heading = value; //updateArrows(); + //99 in next line used to one-time initalize arrows (with reference vs. fixed-north direction) on non-compass devices float lastHeading = heading != null ? heading : 99; heading = value; if (heading != null && Math.abs(MapUtils.degreesDiff(lastHeading, heading)) > 5) { From 7bb5cd44eb5ad9ab50c2211fa0ab16ddb3606683 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 10:43:17 +0100 Subject: [PATCH 266/372] Document bug found for devices without compass --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 1 + .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 175ad01bb1..220c54ca25 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -787,6 +787,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that + //TODO: Looks like screenOrientation correction must always be set 0 for devices without compass? int screenOrientation = 0; screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index e783eb9869..12469f50cf 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -186,6 +186,7 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that + //TODO: Looks like screenOrientation correction must always be set 0 for devices without compass? int screenOrientation = 0; screenOrientation = ((WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) @@ -208,7 +209,7 @@ public class DashFavoritesFragment extends DashBaseFragment { direction.setImageDrawable(draw); } - public void updateCompassValue(float value) { + public void updateArrows(float value) { //heading = value; //updateArrows(); //99 in next line used to one-time initalize arrows (with reference vs. fixed-north direction) on non-compass devices From d19442fae257cf0344144e2b3d5c7347b6bca3bc Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 11:02:35 +0100 Subject: [PATCH 267/372] allow correction for non-compass devices --- .../osmand/plus/activities/search/SearchPOIActivity.java | 9 ++++++++- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 220c54ca25..be159ba150 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -51,6 +51,7 @@ import android.app.AlertDialog.Builder; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.hardware.SensorManager; import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Matrix; @@ -787,7 +788,6 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that - //TODO: Looks like screenOrientation correction must always be set 0 for devices without compass? int screenOrientation = 0; screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) @@ -805,6 +805,13 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa screenOrientation = 180; break; } + + //Looks like screenOrientation correction must not be applied for devices without compass? + Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + if (s == null) { + screenOrientation = 0; + { + draw.setAngle(mes[1] - a + 180 + screenOrientation); draw.setOpenedColor(opened); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 12469f50cf..a03fbb145f 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -3,6 +3,7 @@ package net.osmand.plus.dashboard; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.hardware.SensorManager; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -186,7 +187,6 @@ public class DashFavoritesFragment extends DashBaseFragment { //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation //TODO: getOrientation() needs to be used for API<8, deprecated after that - //TODO: Looks like screenOrientation correction must always be set 0 for devices without compass? int screenOrientation = 0; screenOrientation = ((WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) @@ -204,6 +204,13 @@ public class DashFavoritesFragment extends DashBaseFragment { screenOrientation = 180; break; } + + //Looks like screenOrientation correction must not be applied for devices without compass? + Sensor s = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + if (s == null) { + screenOrientation = 0; + { + draw.setAngle(mes[1] - a + 180 + screenOrientation); direction.setImageDrawable(draw); From aca9132bbc3a8aa1eaea42cd708e480a7cb162c5 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 11:06:23 +0100 Subject: [PATCH 268/372] revert accidental change --- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index a03fbb145f..6b710e746c 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -216,7 +216,7 @@ public class DashFavoritesFragment extends DashBaseFragment { direction.setImageDrawable(draw); } - public void updateArrows(float value) { + public void updateCompassValue(float value) { //heading = value; //updateArrows(); //99 in next line used to one-time initalize arrows (with reference vs. fixed-north direction) on non-compass devices From 743d43d637f0a8f6f160f22e5dd5458d97c2ffb0 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 11:11:38 +0100 Subject: [PATCH 269/372] fix typo --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 2 +- OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index be159ba150..313653f05b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -810,7 +810,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); if (s == null) { screenOrientation = 0; - { + } draw.setAngle(mes[1] - a + 180 + screenOrientation); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 6b710e746c..7bf6504be6 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -209,7 +209,7 @@ public class DashFavoritesFragment extends DashBaseFragment { Sensor s = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); if (s == null) { screenOrientation = 0; - { + } draw.setAngle(mes[1] - a + 180 + screenOrientation); From 0b71031e6ab1958fe61bacb52b3c46df2d008828 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 11:16:58 +0100 Subject: [PATCH 270/372] fix build for now --- .../osmand/plus/activities/search/SearchPOIActivity.java | 8 ++++---- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 313653f05b..ff61980ea2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -807,10 +807,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa } //Looks like screenOrientation correction must not be applied for devices without compass? - Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - if (s == null) { - screenOrientation = 0; - } + // Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + // if (s == null) { + // screenOrientation = 0; + // } draw.setAngle(mes[1] - a + 180 + screenOrientation); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 7bf6504be6..8e333cbd22 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -206,10 +206,10 @@ public class DashFavoritesFragment extends DashBaseFragment { } //Looks like screenOrientation correction must not be applied for devices without compass? - Sensor s = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - if (s == null) { - screenOrientation = 0; - } + // Sensor s = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + // if (s == null) { + // screenOrientation = 0; + // } draw.setAngle(mes[1] - a + 180 + screenOrientation); From 0f7fddeae01388537d49bd8de8c826d8d6397d5e Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 11:22:31 +0100 Subject: [PATCH 271/372] try private --- .../osmand/plus/activities/search/SearchPOIActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index ff61980ea2..0e58517087 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -807,10 +807,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa } //Looks like screenOrientation correction must not be applied for devices without compass? - // Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - // if (s == null) { - // screenOrientation = 0; - // } + private Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + if (s == null) { + screenOrientation = 0; + } draw.setAngle(mes[1] - a + 180 + screenOrientation); From ed95f35fdd009c73f5a42e42bec0e66303e995aa Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 11:25:29 +0100 Subject: [PATCH 272/372] fix build for now --- .../osmand/plus/activities/search/SearchPOIActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 0e58517087..ff61980ea2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -807,10 +807,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa } //Looks like screenOrientation correction must not be applied for devices without compass? - private Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - if (s == null) { - screenOrientation = 0; - } + // Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + // if (s == null) { + // screenOrientation = 0; + // } draw.setAngle(mes[1] - a + 180 + screenOrientation); From 8d639d4b637946b5b67f864edca21e6875b190a4 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 11:32:10 +0100 Subject: [PATCH 273/372] import Sensor --- .../osmand/plus/activities/search/SearchPOIActivity.java | 9 +++++---- .../net/osmand/plus/dashboard/DashFavoritesFragment.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index ff61980ea2..8253693fb6 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -51,6 +51,7 @@ import android.app.AlertDialog.Builder; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.hardware.Sensor; import android.hardware.SensorManager; import android.graphics.Canvas; import android.graphics.ColorFilter; @@ -807,10 +808,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa } //Looks like screenOrientation correction must not be applied for devices without compass? - // Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - // if (s == null) { - // screenOrientation = 0; - // } + Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + if (s == null) { + screenOrientation = 0; + } draw.setAngle(mes[1] - a + 180 + screenOrientation); diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 8e333cbd22..1b3aa6ea1c 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -3,6 +3,7 @@ package net.osmand.plus.dashboard; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.hardware.Sensor; import android.hardware.SensorManager; import android.graphics.Typeface; import android.graphics.drawable.Drawable; @@ -206,10 +207,10 @@ public class DashFavoritesFragment extends DashBaseFragment { } //Looks like screenOrientation correction must not be applied for devices without compass? - // Sensor s = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - // if (s == null) { - // screenOrientation = 0; - // } + Sensor s = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + if (s == null) { + screenOrientation = 0; + } draw.setAngle(mes[1] - a + 180 + screenOrientation); From 1561913fe312a74b209c71ea4cc275fadf626565 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 15:27:50 +0100 Subject: [PATCH 274/372] amend comments --- .../src/net/osmand/plus/activities/search/SearchPOIActivity.java | 1 - OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 1 - 2 files changed, 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 8253693fb6..20626bdbc7 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -788,7 +788,6 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa float a = h != null ? h : 0; //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation - //TODO: getOrientation() needs to be used for API<8, deprecated after that int screenOrientation = 0; screenOrientation = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 1b3aa6ea1c..bc9af776ae 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -187,7 +187,6 @@ public class DashFavoritesFragment extends DashBaseFragment { float a = h != null ? h : 0; //Hardy: getRotation() is the correction if device's screen orientation != the default display's standard orientation - //TODO: getOrientation() needs to be used for API<8, deprecated after that int screenOrientation = 0; screenOrientation = ((WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation(); switch (screenOrientation) From 39d55515d6baec282e967a4e9c9c36c4a56915fb Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Tue, 6 Jan 2015 13:17:03 +0100 Subject: [PATCH 275/372] Translated using Weblate (Russian) Currently translated at 93.7% (573 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index d666528e2b..37297d87b3 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -638,4 +638,5 @@ Водные горки Радар + Аквариум From 5472efe072bb18498d3dd7c4e8d67b8071ebd692 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Jan 2015 15:53:14 +0100 Subject: [PATCH 276/372] rename variable for readability --- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 4 ++-- .../src/net/osmand/plus/dashboard/DashFavoritesFragment.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 20626bdbc7..5259806dea 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -807,8 +807,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa } //Looks like screenOrientation correction must not be applied for devices without compass? - Sensor s = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - if (s == null) { + Sensor compass = ((SensorManager) getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + if (compass == null) { screenOrientation = 0; } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index bc9af776ae..85ba30274f 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -206,8 +206,8 @@ public class DashFavoritesFragment extends DashBaseFragment { } //Looks like screenOrientation correction must not be applied for devices without compass? - Sensor s = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); - if (s == null) { + Sensor compass = ((SensorManager) getActivity().getSystemService(Context.SENSOR_SERVICE)).getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD); + if (compass == null) { screenOrientation = 0; } From 7a7d2b325a3b42877eb76a8d90988bfb7b6c6de1 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 6 Jan 2015 20:06:21 +0100 Subject: [PATCH 277/372] Fix NPE --- OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java index b974c14d61..99bd2b91f6 100644 --- a/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java +++ b/OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java @@ -80,7 +80,7 @@ public class CurrentPositionHelper { } }; calculatingThread = app.getRoutingHelper().startTaskInRouteThreadIfPossible(run); - } else if (!calcThread.isAlive()) { + } else if (calcThread != null && !calcThread.isAlive()) { calculatingThread = null; } } From e2f1110b484e5ad1fd1217e0eacd9df2779b9e7e Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Tue, 6 Jan 2015 17:25:23 +0100 Subject: [PATCH 278/372] Translated using Weblate (Belarusian (latin)) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-be-rBY/strings.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml index c6bf7bdd8a..8e9d91eb6b 100644 --- a/OsmAnd/res/values-be-rBY/strings.xml +++ b/OsmAnd/res/values-be-rBY/strings.xml @@ -413,8 +413,8 @@ Z viersіі 4.4 Android (KitKat) vy nia možacie zahružać і abnaŭliać mapu ŭ papiarednіm katalohu zachoŭvańnia (%s). Vy chočacie źmianіć kataloh na dazvolieny і skapіjavać usie fajly OsmAnd tudy?\n Zaŭvaha 1: Vašy staryja fajly zastanucca niekranutymі (vy možacie vydalіć іch samastojna).          \n Zaŭvaha 2: U novym miescy zachoŭvańnia budzie niemahčyma adnačasova vykarystoŭvać fajly ŭ OsmAnd і OsmAnd+. Kapіravańnie fajla (%s) u novaje miesca… - Kapіjavańnie dadzienych OsmAnd u novaje miesca (%s) - Kapіjavańnie dadzienych OsmAnd + Kapіjavańnie dadzienych OsmAnd u novaje miesca (%s)… + Kapіjavańnie dadzienych OsmAnd… Raźlіčyć pazasiecіŭny maršrut OsmAnd Hruzavіk Navіhacyjnyja nastrojkі @@ -1307,8 +1307,7 @@ Razviarnuć kіrunak GPX Vykarystoŭvać biahučy punkt pryznačeńnia Prajścі ŭvieś šliach spačatku - Dlia hetaj pazіcyі dastupnyja lakaĺnyja viektarnyja mapy.\n\t\n\tDlia іch vykarystańnia abiarycie punkt mieniu -\nalada mapy > rynіca mapy... > akaĺnyja viektarnyja mapy + Dlia hetaj pazіcyі dastupnyja lakaĺnyja viektarnyja mapy.\n\t\n\tDlia іch vykarystańnia abiarycie punkt meniu Nalada mapy > Krynіca mapy... > Lakaĺnyja vektarnyja mapy. Vyvad halasavych padkazak Abiarycie kanal prajhravańnia halasavych padkazak Kanal tieliefanavańnia From c95dcf10e47161526e316a642e9bc1c489f7322b Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 6 Jan 2015 21:45:58 +0100 Subject: [PATCH 279/372] Commit poi with name --- .../net/osmand/binary/BinaryInspector.java | 4 ++-- .../src/net/osmand/osm/MapRenderingTypes.java | 19 ++++++++++++++----- .../src/net/osmand/osm/edit/EntityParser.java | 5 +++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index caaedd891b..2e6b96989f 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -60,13 +60,13 @@ public class BinaryInspector { // test cases show info if(args.length == 1 && "test".equals(args[0])) { in.inspector(new String[]{ - //"-vpoi", + "-vpoi", // "-vmap", "-vmapobjects", // "-vrouting", // "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings", //"-zoom=16", //"-bbox=4,55,7,50", -// "/home/victor/projects/osmand/osm-gen/Map.obf" + "/home/victor/projects/osmand/osm-gen/Map.obf" }); } else { in.inspector(args); diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java index 94323bd3e5..4d4e03134a 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java @@ -305,6 +305,7 @@ public class MapRenderingTypes { rType.poiSpecified = parent.poiSpecified; rType.poiCategory = parent.poiCategory; rType.poiPrefix = parent.poiPrefix; + rType.poiWithNameOnly = parent.poiWithNameOnly; rType.namePrefix = parent.namePrefix; rType = registerRuleType(rType); } @@ -375,15 +376,15 @@ public class MapRenderingTypes { return null; } - public AmenityType getAmenityType(String tag, String val){ - return getAmenityType(tag, val, false); + public AmenityType getAmenityType(String tag, String val, boolean hasName){ + return getAmenityType(tag, val, false, hasName); } - public AmenityType getAmenityTypeForRelation(String tag, String val){ - return getAmenityType(tag, val, true); + public AmenityType getAmenityTypeForRelation(String tag, String val, boolean hasName){ + return getAmenityType(tag, val, true, hasName); } - private AmenityType getAmenityType(String tag, String val, boolean relation){ + private AmenityType getAmenityType(String tag, String val, boolean relation, boolean hasName){ // register amenity types Map rules = getEncodingRuleTypes(); MapRulType rt = rules.get(constructRuleKey(tag, val)); @@ -391,6 +392,9 @@ public class MapRenderingTypes { if((relation && !rt.relation) || rt.isAdditionalOrText()) { return null; } + if(rt.poiWithNameOnly && !hasName) { + return null; + } return rt.poiCategory; } rt = rules.get(constructRuleKey(tag, null)); @@ -398,6 +402,9 @@ public class MapRenderingTypes { if((relation && !rt.relation) || rt.isAdditionalOrText()) { return null; } + if(rt.poiWithNameOnly && !hasName) { + return null; + } return rt.poiCategory; } return null; @@ -526,6 +533,7 @@ public class MapRenderingTypes { rtype.poiCategory = AmenityType.getAndRegisterType(poiCategory); } } + rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name")); String poiPrefix = parser.getAttributeValue("", "poi_prefix"); if (poiPrefix != null) { rtype.poiPrefix = poiPrefix; @@ -704,6 +712,7 @@ public class MapRenderingTypes { protected String category = null; protected String poiPrefix; + protected boolean poiWithNameOnly; protected AmenityType poiCategory; // poi_category was specially removed for one tag/value, to skip unnecessary objects protected boolean poiSpecified; diff --git a/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java b/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java index f99a4b22c0..8d60c2e333 100644 --- a/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java +++ b/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java @@ -114,9 +114,10 @@ public class EntityParser { for(Map tags : it) { if (!tags.isEmpty()) { boolean purerelation = relation && !"multipolygon".equals(tags.get("type")); + boolean hasName = !Algorithms.isEmpty(tags.get("name")); for (Map.Entry e : tags.entrySet()) { - AmenityType type = purerelation ? renderingTypes.getAmenityTypeForRelation(e.getKey(), e.getValue()) - : renderingTypes.getAmenityType(e.getKey(), e.getValue()); + AmenityType type = purerelation ? renderingTypes.getAmenityTypeForRelation(e.getKey(), e.getValue(), hasName) + : renderingTypes.getAmenityType(e.getKey(), e.getValue(), hasName ); if (type != null) { String subtype = renderingTypes.getAmenitySubtype(e.getKey(), e.getValue()); Amenity a = parseAmenity(entity, type, subtype, tags, renderingTypes); From 38407ae76316fa6e2b565dd230d1a1f2af252545 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 6 Jan 2015 21:49:38 +0100 Subject: [PATCH 280/372] Commit poi with name --- OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java index 4d4e03134a..7a00363bdc 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java @@ -617,6 +617,7 @@ public class MapRenderingTypes { rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory); rtype.poiSpecified = true; rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation")); + rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name")); rtype.poiPrefix = poiParentPrefix; rtype.onlyPoi = true; rtype.tagValuePattern = new TagValuePattern(poi_tag, null); From 172dd55d73daf9b51f225e4b64844abd677560ab Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 08:52:15 +0100 Subject: [PATCH 281/372] Test if we can simpy manually interrupt route calculation --- .../plus/views/controls/MapRouteInfoControl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index f0780d3b95..1c10c3b69a 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -79,6 +79,16 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().navigateToPoint(latlon, true, -1); } else { //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) + + + //Next few lines temporarily only to test something about app behavior + if(getMyApplication().getLocationProvider().getLocationSimulation().isRouteAnimating()) { + getMyApplication().getLocationProvider().getLocationSimulation().startStopRouteAnimation(mapActivity); + } + routingHelper.getVoiceRouter().interruptRouteCommands(); + routingHelper.clearCurrentRoute(null, new ArrayList()); + + getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); From 9bb7e35e9d20c18f1efe621243f88604c344e11c Mon Sep 17 00:00:00 2001 From: Thomas Tonino Date: Tue, 6 Jan 2015 23:20:59 +0100 Subject: [PATCH 282/372] Translated using Weblate (Dutch) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-nl/strings.xml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index 5432afc36a..5bcac409f8 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -235,8 +235,8 @@ Toon op kaart Online (Nominatim) Huidige positie… - Laatste kaartweergave - Zoek in de buurt van: + Midden van kaart + Startpunt: Zoek hier dichtbij Recent wijzigingen for 0.6.7: \n\t- Offline gegevensmanager (download, verwijder, activeer / deactiveer offline gegevens direct vanuit OsmAnd) @@ -451,7 +451,7 @@ m Verouderd kaartformaat \'\'{0}\'\' wordt niet ondersteund Auto hulp - Interessepunten dichtbij + POI in de omgeving Eigen filter Eten en drinken (winkel) Voor toeristen @@ -514,7 +514,7 @@ Download Zoek openbaar vervoer Openbaar vervoer-resultaten (geen bestemming): - Vervoer resultaten ({0} naar bestemming): + Openbaar vervoer-resultaten ({0} naar bestemming): geen Opnieuw OV zoeken Kaart @@ -602,9 +602,9 @@ Koers Ga door Download regio\'s - Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken. + Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of deze zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken. Naar signaal zoeken… - Zoek dichtbij de laatste kaartlocatie + Zoek bij het midden van de kaart Zoek dichtbij Zelfde als apparaat-instelling Portret @@ -616,14 +616,14 @@ Routes Halte Haltes - Voorbij de route - Voorafgaand aan route + Aansluitende route + Voorafgaande route Zoeken Kies uitstaphalte Nog te volgen afstand Voorafgaande afstand Aantal haltes te gaan - Lengte route + Lengte van route Openbaar vervoer OK Toon haltes openbaar vervoer op kaart @@ -1444,7 +1444,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Wis bestemming Gebruik magnetische sensor in plaats van oriëntatiesensor voor het kompas Gebruik magnetische sensor - Gebruik Kalman-filter om kompasafwijkingen te vermijden + Verminder storingen in het kompas (maakt de kompasweergave langzamer) Gebruik Kalman-filter Toegankelijkheidsmodus: kies eerst een bestemming Gegevens voor hoogtelijnen @@ -1612,9 +1612,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Vrachtauto Vanaf Android 4.4 (KitKat) kunnen kaarten niet meer worden opgeslagen in de bestaande map(%s). Wil je een nieuwe map maken op de toegestane locatie en de OsmAnd-bestanden daar naartoe kopiëren?\n Let op: oude bestanden blijven bestaan. U kunt ze zelf verwijderen.\n Let op: het is niet meer mogelijk bestanden te delen tussen OsmAnd en Osmand+. Wil je dat OsmAnd de bestanden naar de nieuwe map verplaatst? Als je \'Nee\' kiest, gebruikt Osmand een nieuwe, lege map. - Bestand (%s) wordt gekopieerd naar de nieuwe locatie... - OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s) - Kopieer OsmAnd-bestanden + Kopieer bestand (%s) naar de nieuwe locatie… + OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s)… + Kopieer OsmAnd-bestanden… Bereken de route offline met OsmAnd Bij voorkeur autowegen Gebruik bij voorkeur autowegen @@ -1630,7 +1630,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Vermijd autowegen Geef het gewicht van het voertuig voor de routeplanning Gewicht voertuig - GPX-bestand kiezen … + GPX-bestand kiezen… Bestemming kiezen Kies op de kaart… Favoriet… @@ -1840,7 +1840,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A %1$s \nTrack %2$s Huidige geregistreerde track Bewaar als groep van favorieten - Laad %1$s … + Laad %1$s… Huidige tijd Routepunten kiezen Namen van interessepunten @@ -2037,7 +2037,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Duitse wegenkaart Amerikaanse wegenkaart Gebruik routeberekening v1.9 niet - Gebruik routeberekening v1.9 niet + Gebruik de routeregels van vóór versie 1.9 Spoorweg overgang Voetgangers oversteekplaats Toon spoorwegovergangen From 92a0dee45e1a9cfb3a69f2547324c2909f361a4b Mon Sep 17 00:00:00 2001 From: Jur Kis Date: Wed, 7 Jan 2015 07:30:29 +0100 Subject: [PATCH 283/372] Translated using Weblate (Lithuanian) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-lt/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 3d2556de38..2c8c786caa 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -707,7 +707,7 @@ Vėliau Parsisiųsti regionus Ieškoma signalo… - Ieškoti šalia paskutinės vietos žemėlapyje + Ieškoti šalia dabartinio centro žemėlapyje Ieškoti šalia Kaip ir įrenginys Stačias @@ -1286,7 +1286,7 @@ Šiuo metu Wi-Fi neprijungta. Ar norite tęsti siuntimąsį dabartiniu interneto ryšiu? Maudoti magnetinį sensorių naudoti vietoje pokrypio sensoriaus kompaso reikšmei nustatyti Naudoti magnetinį sensorių (kompasą) - Naudoti Kalmano fltrą kompaso parodymų išlyginimui + Sumažina kompaso triukšmą, tačiau prideda inertiškumo Naudoti Kalmano filtrą Prieigos režimas: pirmiausia pasirinkite kelionės tikslą Kontūrinių linijų duomenys From 3f0895821abcde49b710ea882aa9ec4157b47248 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 08:59:31 +0100 Subject: [PATCH 284/372] fix reference --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 1c10c3b69a..7844dfb95f 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -82,8 +82,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio //Next few lines temporarily only to test something about app behavior - if(getMyApplication().getLocationProvider().getLocationSimulation().isRouteAnimating()) { - getMyApplication().getLocationProvider().getLocationSimulation().startStopRouteAnimation(mapActivity); + if(mapActivity.getMyApplication().getLocationProvider().getLocationSimulation().isRouteAnimating()) { + mapActivity.getMyApplication().getLocationProvider().getLocationSimulation().startStopRouteAnimation(mapActivity); } routingHelper.getVoiceRouter().interruptRouteCommands(); routingHelper.clearCurrentRoute(null, new ArrayList()); From 90522fcb839ca8509c24fcdc43c378d9e1362b0a Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 09:12:29 +0100 Subject: [PATCH 285/372] Test build obtained - revert --- .../plus/views/controls/MapRouteInfoControl.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 7844dfb95f..f0780d3b95 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -79,16 +79,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio getTargets().navigateToPoint(latlon, true, -1); } else { //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) - - - //Next few lines temporarily only to test something about app behavior - if(mapActivity.getMyApplication().getLocationProvider().getLocationSimulation().isRouteAnimating()) { - mapActivity.getMyApplication().getLocationProvider().getLocationSimulation().startStopRouteAnimation(mapActivity); - } - routingHelper.getVoiceRouter().interruptRouteCommands(); - routingHelper.clearCurrentRoute(null, new ArrayList()); - - getTargets().setStartPoint(latlon, true, null); } contextMenu.setLocation(latlon, null); From c7a55d66951beafc4bc8bc06a09e6555abb04e05 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 10:57:41 +0100 Subject: [PATCH 286/372] Test build: Try force route re-caculation if stopped due to Issue2515 --- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index f0780d3b95..eb84fa0f41 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -80,6 +80,12 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } else { //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) getTargets().setStartPoint(latlon, true, null); + //--- + //Try force route re-caculation if stopped due to Issue2515 + if (!routingHelper.isRouteBeingCalculated()) { + getTargets().setStartPoint(latlon, true, null); + } + //--- } contextMenu.setLocation(latlon, null); showDialog(); From 8d451298f4d8d57cbae4d142bd0433847694a86e Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 7 Jan 2015 14:23:50 +0300 Subject: [PATCH 287/372] Fix string --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index c8e1dfdaee..6c52297617 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -34,7 +34,7 @@ All Downloads Updates Local - Downloading not possible, please check your Internet connetion. + Downloading not possible, please check your Internet connection. Dismiss All files up to date Use OpenGL rendering From 59e79878e80d30ed593bd4ea52fd68ff09a2c2eb Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 7 Jan 2015 14:45:49 +0300 Subject: [PATCH 288/372] Add string --- OsmAnd/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 6c52297617..7c4b5f8a42 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,6 +9,7 @@ 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Default Announce pedestrian crosswalks Road style Default From ae0c12bb400989010a4de500955e0ba50f935c51 Mon Sep 17 00:00:00 2001 From: Nicolas Palix Date: Wed, 7 Jan 2015 12:36:42 +0100 Subject: [PATCH 289/372] Translated using Weblate (French) Currently translated at 100.0% (1594 of 1594 strings) --- OsmAnd/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 65490e07ad..d43b653e73 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1303,7 +1303,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Utiliser le magnétomètre pour déterminer l\'orientation de la boussole au lieu du capteur d\'orientation Utiliser le magnétomètre (boussole) Courbes de niveau - Utiliser un filtre de Kalman pour éviter les interférences de la boussole + Réduit le bruit sur les mesures de la boussole, mais ajoute de l\'inertie Utiliser un filtre de Kalman Mode d\'accessibilité : veuillez d\'abord définir une destination Mesurer sur la carte From ebeba6b9d73a8e249a502bc9ba01c072a7811ead Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Wed, 7 Jan 2015 13:37:00 +0100 Subject: [PATCH 290/372] Translated using Weblate (French) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-fr/strings.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index d43b653e73..3c1b9c81b8 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -148,7 +148,7 @@ Non défini Position actuelle… - Dernière vue + Centre de la carte Origine : Rechercher autour de ce point Changement pour 0.6.7 : @@ -515,7 +515,7 @@ Téléchargement des régions Merci d\'avoir choisi OsmAnd. La plupart des fonctionnalités de l\'application nécessitent des données régionales, utilisables hors-ligne, que vous pouvez au préalable télécharger (\'Paramètres\' → \'Données hors-ligne\') ou préparer vous-même. Ces données permettront de visualiser les cartes et de rechercher une adresse, un point d\'intérêt (PI) ou un transport public. Recherche d\'un signal… - Rechercher près de la dernière position + Rechercher autour du centre de la carte Rechercher à proximité Automatique Portrait @@ -1894,4 +1894,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Ne pas utiliser les nouvelles règles de routage de la version 1.9 Ne pas utiliser la version 1.9 des calculs de route Annoncer les passages piéton - + Par défaut + From eabe9d28ce77fea7efadde739e6bb7b18d58e5c9 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Wed, 7 Jan 2015 14:33:14 +0100 Subject: [PATCH 291/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-be/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 20a0b93d21..8bf764324e 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1989,4 +1989,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Чыгуначны пераезд Паказваць чыгуначныя пераезды Папярэджваць пра пешаходныя пераходы - + Па змоўчаньні + From 0baa9d1456ac8f5e12af81c7cef0e7b5a8e08dc2 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Wed, 7 Jan 2015 14:54:04 +0100 Subject: [PATCH 292/372] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 158871c384..9bb09ebb6b 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1842,7 +1842,7 @@ 使用 OpenGL 繪製 使用硬體加速 OpenGL 繪製（可能在某些裝置上無法工作） 排除 - 不能下載。請檢查您的網路連線。 + 不能下載，請檢查您的網路連線。 全部下載 更新 本機 @@ -1868,4 +1868,5 @@ 顯示鐵路平交道 顯示行人穿越道 通報行人穿越道 - + 預設 + From 1d97761eac10b47c0acc389880cdd96d69e93d4d Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 16:01:08 +0100 Subject: [PATCH 293/372] More testing regarding trigger of route-recalculation --- .../plus/views/controls/MapRouteInfoControl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index eb84fa0f41..f85eda4df4 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -80,12 +80,13 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } else { //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) getTargets().setStartPoint(latlon, true, null); - //--- + //-Test code only-- //Try force route re-caculation if stopped due to Issue2515 - if (!routingHelper.isRouteBeingCalculated()) { - getTargets().setStartPoint(latlon, true, null); - } - //--- + //if (!routingHelper.isRouteBeingCalculated()) { + routingHelper.recalculateRouteDueToSettingsChange() + // getTargets().setStartPoint(latlon, true, null); + //} + //----------------- } contextMenu.setLocation(latlon, null); showDialog(); From 74ec786abbb7934be4f1886d636371e85c757f09 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 16:04:42 +0100 Subject: [PATCH 294/372] fix typo --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index f85eda4df4..6a4ca96d6a 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -83,7 +83,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio //-Test code only-- //Try force route re-caculation if stopped due to Issue2515 //if (!routingHelper.isRouteBeingCalculated()) { - routingHelper.recalculateRouteDueToSettingsChange() + routingHelper.recalculateRouteDueToSettingsChange(); // getTargets().setStartPoint(latlon, true, null); //} //----------------- From 5086bde8a04d1e382b8114fff4d4e6bd989a9ebe Mon Sep 17 00:00:00 2001 From: Jur Kis Date: Wed, 7 Jan 2015 16:09:48 +0100 Subject: [PATCH 295/372] Translated using Weblate (Lithuanian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-lt/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 2c8c786caa..4c0522ea31 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -1882,4 +1882,5 @@ Rodyti pėsčiųjų perėjas Pranešti apie perėjas Pėčiųjų perėja + Numatytasis From c1ccaf85ad323a179e21ecd0353faaaf4f9e640d Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 17:03:12 +0100 Subject: [PATCH 296/372] Back out test code for now --- .../views/controls/MapRouteInfoControl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 6a4ca96d6a..4625d7fed8 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -78,15 +78,16 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio if(selectFromMapForTarget) { getTargets().navigateToPoint(latlon, true, -1); } else { - //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) getTargets().setStartPoint(latlon, true, null); - //-Test code only-- - //Try force route re-caculation if stopped due to Issue2515 - //if (!routingHelper.isRouteBeingCalculated()) { - routingHelper.recalculateRouteDueToSettingsChange(); - // getTargets().setStartPoint(latlon, true, null); - //} - //----------------- + //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) + //-Test code only-- + //Try force resuming route re-caculation if stopped due to Issue2515 + //if (!routingHelper.isRouteBeingCalculated()) { + // getTargets().setStartPoint(latlon, true, null); + //} + //or like this: + // routingHelper.recalculateRouteDueToSettingsChange(); + //----------------- } contextMenu.setLocation(latlon, null); showDialog(); From 5b4de19f3d4c1b7f9a4d4a4ef4fb0bc5ede8ea74 Mon Sep 17 00:00:00 2001 From: Jur Kis Date: Wed, 7 Jan 2015 16:11:00 +0100 Subject: [PATCH 297/372] Translated using Weblate (Lithuanian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-lt/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 4c0522ea31..ca6d671487 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -340,7 +340,7 @@ Nenurodyta Esama vieta… - Paskutinė žiūrėta žemėlapio vieta + Esamo žemėlapio centras Pradžia: Ieškoti netoliese nuo čia Pakeitimai 0.6.7 versijoje : From d3b16e84f1027c638261747fd93e8302986166b0 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 17:20:46 +0100 Subject: [PATCH 298/372] Add "Display language" and "Device language" to Menus in Latin characters --- OsmAnd/res/values/no_translate.xml | 2 ++ OsmAnd/src/net/osmand/plus/OsmandSettings.java | 2 +- .../net/osmand/plus/activities/SettingsGeneralActivity.java | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml index 93c8675391..a94d817e31 100644 --- a/OsmAnd/res/values/no_translate.xml +++ b/OsmAnd/res/values/no_translate.xml @@ -36,4 +36,6 @@ \n\tHarry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant. + Display language + Device language diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index d16d0e443e..9900bff1a3 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -729,7 +729,7 @@ public class OsmandSettings { public final OsmandPreference SHOW_POI_LABEL = new BooleanPreference("show_poi_label", false).makeGlobal(); // this value string is synchronized with settings_pref.xml preference name - public final OsmandPreference PREFERRED_LOCALE = new StringPreference("preferred_locale", "").makeGlobal(); + public final OsmandPreference PREFERRED_LOCALE = new StringPreference("preferred_locale" + " (" + preferred_locale_no_translate + ")", "").makeGlobal(); public static final String TRANSPORT_STOPS_OVER_MAP = "transportStops"; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index cb8477f190..ef9c93dfa1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -153,6 +153,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { // See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/ String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")"; + String latinSystemDefaultSuffix = " (" + getString(R.string.system_default_no_translate) + ")"; + //getResources().getAssets().getLocales(); entrieValues = new String[] { "", "en", @@ -203,7 +205,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { "uk", "vi", "cy"}; - entries = new String[] { getString(R.string.system_locale), + entries = new String[] { getString(R.string.system_locale) + latinSystemDefaultSuffix, getString(R.string.lang_en), getString(R.string.lang_af), getString(R.string.lang_al) + incompleteSuffix, From 69816ed10c7d2e0f906ceb870be905b3f980d193 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 17:48:28 +0100 Subject: [PATCH 299/372] fix build --- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 9900bff1a3..d16d0e443e 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -729,7 +729,7 @@ public class OsmandSettings { public final OsmandPreference SHOW_POI_LABEL = new BooleanPreference("show_poi_label", false).makeGlobal(); // this value string is synchronized with settings_pref.xml preference name - public final OsmandPreference PREFERRED_LOCALE = new StringPreference("preferred_locale" + " (" + preferred_locale_no_translate + ")", "").makeGlobal(); + public final OsmandPreference PREFERRED_LOCALE = new StringPreference("preferred_locale", "").makeGlobal(); public static final String TRANSPORT_STOPS_OVER_MAP = "transportStops"; From 88e3158bc9622d1f03bca1c24639d3d05e6dc163 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 7 Jan 2015 17:56:13 +0100 Subject: [PATCH 300/372] Translated using Weblate (Danish) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-da/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index e086a407e5..b048d4f70e 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1876,4 +1876,5 @@ Jernbaneoverskæringer Fodgængerovergange Fodgængerovergange - + Standard + From 2079441c265719324f182c3284c295788b66edfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Wed, 7 Jan 2015 18:02:33 +0100 Subject: [PATCH 301/372] Translated using Weblate (Slovenian) Currently translated at 100% (0 of 0 strings) Created new translation. --- OsmAnd/res/values-sl/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 OsmAnd/res/values-sl/phrases.xml diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml new file mode 100644 index 0000000000..a6b3daec93 --- /dev/null +++ b/OsmAnd/res/values-sl/phrases.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 196d2d739528faa4a26ef23097b58450053b6e07 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 18:05:28 +0100 Subject: [PATCH 302/372] Try concatenating in XML file --- OsmAnd/res/xml/general_settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/xml/general_settings.xml b/OsmAnd/res/xml/general_settings.xml index 9d8cf09906..b8a4258665 100644 --- a/OsmAnd/res/xml/general_settings.xml +++ b/OsmAnd/res/xml/general_settings.xml @@ -4,7 +4,7 @@ - + From 9b415b31cec66f42505360c0fea224c1fc2ffd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Wed, 7 Jan 2015 18:05:05 +0100 Subject: [PATCH 303/372] Translated using Weblate (Slovenian) Currently translated at 0.3% (2 of 611 strings) --- OsmAnd/res/values-sl/phrases.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sl/phrases.xml b/OsmAnd/res/values-sl/phrases.xml index a6b3daec93..85dad97cae 100644 --- a/OsmAnd/res/values-sl/phrases.xml +++ b/OsmAnd/res/values-sl/phrases.xml @@ -1,2 +1,4 @@ - - \ No newline at end of file + +Pekarna + Veleblagovnica + From 50c2eb50e41983c93f7957f7cd2ade9ec94aab76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Wed, 7 Jan 2015 18:08:41 +0100 Subject: [PATCH 304/372] Translated using Weblate (Slovenian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-sl/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index ded65228c6..63734518c2 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1967,4 +1967,5 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Območje y koordinata x koordinata - + Privzeto + From 47292ac986bf5e7b9a56285fa83e0b8272a719c1 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 18:30:43 +0100 Subject: [PATCH 305/372] See if strings file can be referenced --- OsmAnd/res/values/no_translate.xml | 2 +- OsmAnd/res/xml/general_settings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/no_translate.xml b/OsmAnd/res/values/no_translate.xml index a94d817e31..1a05ffeebc 100644 --- a/OsmAnd/res/values/no_translate.xml +++ b/OsmAnd/res/values/no_translate.xml @@ -37,5 +37,5 @@ Display language - Device language + Device language diff --git a/OsmAnd/res/xml/general_settings.xml b/OsmAnd/res/xml/general_settings.xml index b8a4258665..65f2dc6cf7 100644 --- a/OsmAnd/res/xml/general_settings.xml +++ b/OsmAnd/res/xml/general_settings.xml @@ -4,7 +4,7 @@ - + From c98458fba191f33dbf1922ca1c61adc32a13c688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0tefan=20Baebler?= Date: Wed, 7 Jan 2015 18:11:10 +0100 Subject: [PATCH 306/372] Translated using Weblate (Slovenian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-sl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 63734518c2..ebd53fc3d0 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -944,7 +944,7 @@ Kasneje Prenos območij Iskanje znaka … - Iskanje v bližini zadnje lokacije + Iskanje v bližini zadnje lokacije na zemljevidu "Vir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' → \'Nastavitve zemljevida\'. \n\nPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\' v \'Nastavitve\' → \'Upravljalnik vtičnikov\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku. \n\nOsmAnd podpira tudi vire po meri. " From 7a5f0e052e6d129cc12e36d1695c63ae9d1e2286 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Wed, 7 Jan 2015 18:35:38 +0100 Subject: [PATCH 307/372] Translated using Weblate (Russian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ru/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 42a3fed8b9..36dac72ca5 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1849,4 +1849,5 @@ Железнодорожный переезд Пешеходный переход Сообщать о пешеходных переходах - + По умолчанию + From 9f32849320bc7a07488e48b7edbb88c4aa567bdd Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 18:37:44 +0100 Subject: [PATCH 308/372] revert in xml, must be done in java it looks like --- OsmAnd/res/xml/general_settings.xml | 2 +- .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/xml/general_settings.xml b/OsmAnd/res/xml/general_settings.xml index 65f2dc6cf7..9d8cf09906 100644 --- a/OsmAnd/res/xml/general_settings.xml +++ b/OsmAnd/res/xml/general_settings.xml @@ -4,7 +4,7 @@ - + diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index ef9c93dfa1..498f874b79 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -153,6 +153,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { // See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/ String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")"; + // Add this in Latin also so it can be more easily identified if foreign language has been selected by mistake String latinSystemDefaultSuffix = " (" + getString(R.string.system_default_no_translate) + ")"; //getResources().getAssets().getLocales(); From ec28acee59fabc3b0efb16b6e48c80bcb8aefba9 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 18:42:31 +0100 Subject: [PATCH 309/372] fix build --- .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 498f874b79..76566968cb 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -154,7 +154,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { // See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/ String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")"; // Add this in Latin also so it can be more easily identified if foreign language has been selected by mistake - String latinSystemDefaultSuffix = " (" + getString(R.string.system_default_no_translate) + ")"; + String latinSystemDefaultSuffix = " (" + getString(R.string.system_language_no_translate) + ")"; //getResources().getAssets().getLocales(); entrieValues = new String[] { "", From 8168b68f0238b24be6730083c0f5207c9172c2c2 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Wed, 7 Jan 2015 19:33:52 +0100 Subject: [PATCH 310/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ca/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 834666d315..8c7d00336d 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1860,4 +1860,5 @@ Sense preferències de navegació v1.9 No feu ús de les preferències de navegació introduïdes a la v1.9 Anuncia els passos de zebra - + Renderització per defecte + From f20d00a95a32ab95dd78da0db044c3c576ec8125 Mon Sep 17 00:00:00 2001 From: ace shadow Date: Wed, 7 Jan 2015 20:39:18 +0100 Subject: [PATCH 311/372] Translated using Weblate (Slovak) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-sk/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 4c36b01f9b..8ae483783f 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -2027,4 +2027,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Bez smerovacích pravidiel verzie 1.9 Nepoužívať pravidlá výpočtu trasy zavedené vo verzii 1.9 Oznamovať priechody pre chodcov - + Predvolené + From 3d30ee633216bd838a31bef8baad020f1238e81e Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 21:27:31 +0100 Subject: [PATCH 312/372] fix name --- .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 76566968cb..081998c7f3 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -154,7 +154,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { // See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/ String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")"; // Add this in Latin also so it can be more easily identified if foreign language has been selected by mistake - String latinSystemDefaultSuffix = " (" + getString(R.string.system_language_no_translate) + ")"; + String latinSystemDefaultSuffix = " (" + getString(R.string.system_locale_no_translate) + ")"; //getResources().getAssets().getLocales(); entrieValues = new String[] { "", From 178804c2892ab5a5f2158003b39ba7e7eeac724f Mon Sep 17 00:00:00 2001 From: josep constanti Date: Wed, 7 Jan 2015 19:39:09 +0100 Subject: [PATCH 313/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 8c7d00336d..80694b6220 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1166,7 +1166,7 @@ Desa com a GPX Obre un fitxer GPX existent Espereu fins que finalitzi la tasca actual - Utilitzeu el filtre Kalman per evitar interferències a la brúixola + Allisat de la brúixola per estabilitzar lectures afegint inèrcia Usa el filtre Kalman Mode d\'accessibilitat: seleccioneu primer la destinació Podeu usar el sensor magnètic per determinar el valor la brúixola en comptes del sensor d\'orientació From 60a9f2fbe40736fae749e74dcf1a46f43f72cada Mon Sep 17 00:00:00 2001 From: ace shadow Date: Wed, 7 Jan 2015 20:40:01 +0100 Subject: [PATCH 314/372] Translated using Weblate (Slovak) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-sk/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 8ae483783f..5fff92554a 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -2001,7 +2001,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Všetky súbory sú aktuálne Použiť vykresľovanie OpenGL Použiť hardvérovo urýchľované vykresľovanie pomocou OpenGL (nemusí na niektorých zariadeniach fungovať) - Sťahovanie nie je možné, prosím pripojte sa na WiFi, aby bolo možné pokračovať. + Sťahovanie nie je možné, prosím skontrolujte pripojenie na Internet. Zóna Všetky sťahovania Aktualizácie From d7b6924b2352d5c3cb9e96d0b6a65f6b0fd5d0af Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Wed, 7 Jan 2015 20:28:37 +0100 Subject: [PATCH 315/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1587 of 1595 strings) --- OsmAnd/res/values-sv/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index f000c30cce..1844914ff2 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1768,4 +1768,5 @@ Destination Röstprompter Meddela om övergångsställen - + Standard + From 00bfe5e4d839bf9404977f604da2a52520114a8c Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 21:44:43 +0100 Subject: [PATCH 316/372] Latin "Display language" in menu title --- .../net/osmand/plus/activities/SettingsGeneralActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 081998c7f3..fc6afaff8a 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -256,6 +256,10 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { getString(R.string.lang_vi) + incompleteSuffix, getString(R.string.lang_cy) + incompleteSuffix,}; registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues); + // Display "Device language" in Latin for all non-en languages + if (!R.string.preferred_locale.getText().toString().equals(R.string.preferred_locale_no_translate.getText().toString())) { + ((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(R.string.preferred_locale + " (" + R.string.preferred_locale_no_translate + ")"); + } } From 10992b53b8b0a0aa02d1ce27acc50b240a8686a4 Mon Sep 17 00:00:00 2001 From: Roberto GEB Date: Wed, 7 Jan 2015 22:04:27 +0100 Subject: [PATCH 317/372] Translated using Weblate (Spanish) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-es/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index e977315b63..01ce81871e 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -1886,4 +1886,5 @@ Para poder usar muchas características de la aplicación necesitas algunos dato Al este Al norte Anunciar pasos de peatones - + Por defecto + From ea5431816fcf913ab007a715da9ecbeab2d504a2 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 22:14:29 +0100 Subject: [PATCH 318/372] try get resource comparison right --- .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index fc6afaff8a..543935f822 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -257,7 +257,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { getString(R.string.lang_cy) + incompleteSuffix,}; registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues); // Display "Device language" in Latin for all non-en languages - if (!R.string.preferred_locale.getText().toString().equals(R.string.preferred_locale_no_translate.getText().toString())) { + if (!getResources().getString(R.string.preferred_locale).getText().equals(getResources().getString(R.string.preferred_locale_no_translate).getText())) { ((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(R.string.preferred_locale + " (" + R.string.preferred_locale_no_translate + ")"); } } From 545668f1dbf8cd6f59bd8b5e661951b6a1bbf800 Mon Sep 17 00:00:00 2001 From: Roberto GEB Date: Wed, 7 Jan 2015 22:06:43 +0100 Subject: [PATCH 319/372] Translated using Weblate (Spanish) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-es/strings.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index 01ce81871e..b4719b2447 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -502,8 +502,7 @@ Cabecera Después Descargar regiones - Gracias por elegir OsmAnd. -Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Después, podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público. + Gracias por elegir OsmAnd. Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Entonces podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público. Buscando señal… Buscar cerca del centro del mapa Buscar cercanos @@ -1860,7 +1859,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato No se ha encontrado circunvalación Todos los archivos actualizados Descartar - Imposible descargar, compruebe su conexión a Internet. + Imposible descargar; por favor, comprueba tu conexión a Internet. Todas las descargas Actualizaciones Local From 8c35e4a353401ea74e88f561b6971a15a71cd2cc Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 22:26:50 +0100 Subject: [PATCH 320/372] remove getText() --- .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 543935f822..d5367be2e7 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -257,7 +257,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { getString(R.string.lang_cy) + incompleteSuffix,}; registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues); // Display "Device language" in Latin for all non-en languages - if (!getResources().getString(R.string.preferred_locale).getText().equals(getResources().getString(R.string.preferred_locale_no_translate).getText())) { + if (!getResources().getString(R.string.preferred_locale).equals(getResources().getString(R.string.preferred_locale_no_translate))) { ((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(R.string.preferred_locale + " (" + R.string.preferred_locale_no_translate + ")"); } } From 23aab4df5ec38944aa9b124603365d0cca7ded12 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Jan 2015 22:41:04 +0100 Subject: [PATCH 321/372] add missing gerString() --- .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index d5367be2e7..9eecd2b5c5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -258,7 +258,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues); // Display "Device language" in Latin for all non-en languages if (!getResources().getString(R.string.preferred_locale).equals(getResources().getString(R.string.preferred_locale_no_translate))) { - ((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(R.string.preferred_locale + " (" + R.string.preferred_locale_no_translate + ")"); + ((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(getString(R.string.preferred_locale) + " (" + getString(R.string.preferred_locale_no_translate) + ")"); } } From e1300b9df74ee4aea6f9ad135ed794f2ba2b5117 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 8 Jan 2015 00:19:54 +0100 Subject: [PATCH 322/372] Fix rendering types issue --- OsmAnd-java/src/net/osmand/binary/BinaryInspector.java | 8 ++++---- OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index 2e6b96989f..2f24bddba8 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -60,12 +60,12 @@ public class BinaryInspector { // test cases show info if(args.length == 1 && "test".equals(args[0])) { in.inspector(new String[]{ - "-vpoi", -// "-vmap", "-vmapobjects", +// "-vpoi", + "-vmap", "-vmapobjects", // "-vrouting", // "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings", //"-zoom=16", - //"-bbox=4,55,7,50", +// "-bbox=1.74,51.17,1.75,51.16", "/home/victor/projects/osmand/osm-gen/Map.obf" }); } else { @@ -727,7 +727,7 @@ public class BinaryInspector { for(int i=0; i Date: Thu, 8 Jan 2015 00:23:48 +0100 Subject: [PATCH 323/372] See if this fixes route-recalculation if settings change during ongoing calculation --- OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 1fd10b52c2..2cc709af96 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -772,6 +772,8 @@ public class RoutingHelper { } public void recalculateRouteDueToSettingsChange() { + //See if this fixes route-recalculation if settings change during ongoing calculation + clearCurrentRoute(finalLocation, intermediatePoints); recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false); } From e69bbb25d3113e8c821b947a2ca904f6d11871b5 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 8 Jan 2015 00:36:29 +0100 Subject: [PATCH 324/372] Remove misleading "OK" caption on "Avoid roads" dialog --- OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java index ef9f2bdef5..0bacc38e65 100644 --- a/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java +++ b/OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java @@ -125,7 +125,7 @@ public class AvoidSpecificRoads { } }); - bld.setPositiveButton(R.string.default_buttons_ok, null); + bld.setPositiveButton(R.string.close, null); bld.show(); } From aae4c48c59ee89042e0c55e70c2e83b0d8f133de Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 8 Jan 2015 00:54:50 +0100 Subject: [PATCH 325/372] Try fix other half of Issue 2515 --- OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java | 2 +- .../net/osmand/plus/views/controls/MapRouteInfoControl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 2cc709af96..ad57a7b822 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -772,7 +772,7 @@ public class RoutingHelper { } public void recalculateRouteDueToSettingsChange() { - //See if this fixes route-recalculation if settings change during ongoing calculation + //This should fix route-recalculation if settings change during ongoing calculation clearCurrentRoute(finalLocation, intermediatePoints); recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false); diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 4625d7fed8..db547d3fc7 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -85,12 +85,14 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio //if (!routingHelper.isRouteBeingCalculated()) { // getTargets().setStartPoint(latlon, true, null); //} - //or like this: - // routingHelper.recalculateRouteDueToSettingsChange(); //----------------- } contextMenu.setLocation(latlon, null); showDialog(); + //-Test code only-- + //Try force resuming route re-caculation if stopped due to Issue2515 + routingHelper.recalculateRouteDueToSettingsChange(); + //----------------- return true; } return super.onSingleTap(point, tileBox); From 9730fa59c5a796d89753f6f9da3bc3aa8b9d6804 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 8 Jan 2015 01:09:49 +0100 Subject: [PATCH 326/372] see if this restores alternating behavior --- .../src/net/osmand/plus/views/controls/MapRouteInfoControl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index db547d3fc7..91dd8bbcb1 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -92,6 +92,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio //-Test code only-- //Try force resuming route re-caculation if stopped due to Issue2515 routingHelper.recalculateRouteDueToSettingsChange(); + routingHelper.recalculateRouteDueToSettingsChange(); //----------------- return true; } From 356773d6fffa7d2e6b0f88e5d80bda717f57c9f7 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 8 Jan 2015 01:15:47 +0100 Subject: [PATCH 327/372] Update rendering additional --- .../osmand/render/RenderingRuleProperty.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java b/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java index 09af86b0f1..35471fb47d 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java @@ -3,6 +3,7 @@ package net.osmand.render; import net.osmand.PlatformUtil; import net.osmand.binary.BinaryMapDataObject; +import net.osmand.binary.BinaryMapIndexReader.TagValuePair; import org.apache.commons.logging.Log; @@ -283,16 +284,27 @@ public class RenderingRuleProperty { return val != null && val.equals(val2); } - int i = val.indexOf('='); - if (i != -1) { - String ts = val.substring(0, i); - String vs = val.substring(i + 1); + int k = val.indexOf('='); + if (k != -1) { + String ts = val.substring(0, k); + String vs = val.substring(k + 1); Integer ruleInd = req.getObject().getMapIndex().getRule(ts, vs); if (ruleInd != null) { if (req.getObject().containsAdditionalType(ruleInd)) { return true; } } + } else { + String ts = val.substring(0, k); + if (ts != null) { + int[] additionalTypes = obj.getAdditionalTypes(); + for (int i = 0; i < additionalTypes.length; i++) { + TagValuePair vp = obj.getMapIndex().decodeType(additionalTypes[i]); + if (vp != null && ts.equals(vp.tag)) { + return true; + } + } + } } return false; } From af63d3ed5531ddaf2e4270e1943a7a08adb1050c Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 8 Jan 2015 01:30:16 +0100 Subject: [PATCH 328/372] back out for now --- .../plus/views/controls/MapRouteInfoControl.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java index 91dd8bbcb1..a12b2352c9 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java @@ -80,19 +80,14 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio } else { getTargets().setStartPoint(latlon, true, null); //TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.) - //-Test code only-- - //Try force resuming route re-caculation if stopped due to Issue2515 - //if (!routingHelper.isRouteBeingCalculated()) { - // getTargets().setStartPoint(latlon, true, null); - //} - //----------------- } contextMenu.setLocation(latlon, null); showDialog(); //-Test code only-- //Try force resuming route re-caculation if stopped due to Issue2515 - routingHelper.recalculateRouteDueToSettingsChange(); - routingHelper.recalculateRouteDueToSettingsChange(); + // interesting: putting one or more of the next lines here destroys the alternating "interrupted route calculation won't re-start" behavior and causes the route calculation to NEVER re-start! + //routingHelper.recalculateRouteDueToSettingsChange(); + //routingHelper.recalculateRouteDueToSettingsChange(); //----------------- return true; } From 56114591134289806290053abe60777ff6831af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= Date: Thu, 8 Jan 2015 06:51:25 +0100 Subject: [PATCH 329/372] Translated using Weblate (Korean) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ko/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index ed94029850..ff1922dfe5 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -2106,4 +2106,5 @@ 철도 교차로 표시 보행자 횡단보도 표시 보행자 횡단보도 알리기 - + 기본값 + From 172baf21589069f0b2a0f729fd7d98c32b4d1b23 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 8 Jan 2015 07:39:57 +0100 Subject: [PATCH 330/372] change string to make clearer this is selectable action --- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index b80bf431ad..1a8ad7d379 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1999,7 +1999,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Bildschirm aktivieren Bildschirm bei Navigationsanweisung aktivieren Niemals - Auswählen auf der Karte + Auf Karte auswählen… Straße blockieren… Straßen- und Eisenbahnlinien Stadtbahnlinien diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 7c4b5f8a42..5e4c48ead0 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -57,7 +57,7 @@ Turn on the screen Turn on the device screen when approaching a turn Never - Select on map + Select on map… Avoid roads… Changes in 1.9: * Updated maps styles with road surface rendering, transport layers and hiking symbols From bf1732fa22b0fe04797e24c5eeea763cc327fe3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Thu, 8 Jan 2015 11:06:55 +0100 Subject: [PATCH 331/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-hu/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 266d8e3e33..dbe4268b77 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1811,4 +1811,5 @@ Nincsenek v1.9-es útvonalszabályok Ne használja az 1.9-es verzióban bevezetett útvonalszabályokat Gyalogátkelőhelyek bejelentése - + Alapértelmezett + From fa172a88997e15f8037ee3d7a813de42288528fa Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 8 Jan 2015 11:46:47 +0100 Subject: [PATCH 332/372] Proper fix of NPE --- .../plus/activities/MainMenuActivity.java | 9 +--- .../DashAudioVideoNotesFragment.java | 4 -- .../plus/dashboard/DashFavoritesFragment.java | 45 +++++++++---------- .../plus/download/BaseDownloadActivity.java | 6 +++ .../plus/download/DownloadActivity.java | 6 --- .../plus/download/DownloadIndexesThread.java | 9 ---- 6 files changed, 27 insertions(+), 52 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java index 69786993f2..6c1e318d5e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java @@ -14,7 +14,6 @@ import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.Version; import net.osmand.plus.base.BasicProgressAsyncTask; -import net.osmand.plus.dashboard.DashAudioVideoNotesFragment; import net.osmand.plus.dashboard.DashDownloadMapsFragment; import net.osmand.plus.dashboard.DashErrorFragment; import net.osmand.plus.dashboard.DashFavoritesFragment; @@ -72,7 +71,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca private static final int HELP_ID = 0; private static final int SETTINGS_ID = 1; private static final int EXIT_ID = 2; - private OsmAndLocationProvider lp; @Override @@ -101,7 +99,6 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca return; } setContentView(R.layout.dashboard); - lp = getMyApplication().getLocationProvider(); String textVersion = Version.getFullVersion(getMyApplication()); if (textVersion.indexOf("#") != -1) { @@ -494,12 +491,8 @@ public class MainMenuActivity extends BaseDownloadActivity implements OsmAndLoca if (f instanceof DashDownloadMapsFragment && !f.isDetached()) { ((DashDownloadMapsFragment) f).refreshData(); } - - if (f instanceof DashAudioVideoNotesFragment && !f.isDetached()) { - ((DashAudioVideoNotesFragment) f).setupNotes(); - } - //Needed to reliably initialize DashFavoritesFragement on devices without compass + // [Victor]: This doesn't look as a proper place, then it highly depends on internet connection and download list if (f instanceof DashFavoritesFragment && !f.isDetached()) { ((DashFavoritesFragment) f).setupFavorites(); } diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java index b9a397ef6d..e66df2b3c1 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java @@ -67,10 +67,6 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment { public void setupNotes() { View mainView = getView(); - if (mainView == null) { - return; - } - if (plugin == null){ mainView.setVisibility(View.GONE); return; diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java index 85ba30274f..dd490b8a63 100644 --- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java +++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java @@ -1,15 +1,31 @@ package net.osmand.plus.dashboard; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import net.osmand.Location; +import net.osmand.data.FavouritePoint; +import net.osmand.data.LatLon; +import net.osmand.plus.FavouritesDbHelper; +import net.osmand.plus.OsmAndAppCustomization; +import net.osmand.plus.OsmAndFormatter; +import net.osmand.plus.R; +import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.base.FavoriteImageDrawable; +import net.osmand.plus.dialogs.DirectionsDialogs; +import net.osmand.plus.helpers.FontCache; +import net.osmand.plus.views.DirectionDrawable; +import net.osmand.util.MapUtils; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.graphics.Typeface; import android.hardware.Sensor; import android.hardware.SensorManager; -import android.graphics.Typeface; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.Nullable; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,22 +34,6 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import net.osmand.Location; -import net.osmand.data.FavouritePoint; -import net.osmand.data.LatLon; -import net.osmand.plus.*; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.activities.search.SearchPOIActivity; -import net.osmand.plus.base.FavoriteImageDrawable; -import net.osmand.plus.dialogs.DirectionsDialogs; -import net.osmand.plus.helpers.FontCache; -import net.osmand.plus.views.DirectionDrawable; -import net.osmand.util.MapUtils; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; /** * Created by Denis on 24.11.2014. @@ -172,7 +172,7 @@ public class DashFavoritesFragment extends DashBaseFragment { return; } - for(int i =0; i list) { diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java index a02e06a5de..16fe8de084 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java @@ -61,12 +61,6 @@ public class DownloadActivity extends BaseDownloadActivity { public static final String SINGLE_TAB = "SINGLE_TAB"; - @Override - protected void onDestroy() { - super.onDestroy(); - BaseDownloadActivity.downloadListIndexThread.resetUiActivity(DownloadActivity.class); - } - @Override protected void onCreate(Bundle savedInstanceState) { getMyApplication().applyTheme(this); diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java index dedae65eb0..1980431664 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java @@ -121,15 +121,6 @@ public class DownloadIndexesThread { public List getItemsToUpdate() { return itemsToUpdate;} - public void resetUiActivity(Class downloadActivityClass) { - if (uiActivity== null){ - return; - } - - if (uiActivity.getClass().equals(downloadActivityClass)){ - uiActivity = null; - } - } public class DownloadIndexesAsyncTask extends BasicProgressAsyncTask implements DownloadFileShowWarning { From 6c5c74a522f115d2cb1682d72a0c0a5804d9cceb Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 11:37:00 +0100 Subject: [PATCH 333/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-be/strings.xml | 65 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 8bf764324e..1e17eda12c 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -602,16 +602,16 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Першапачатковае месцазнаходжаньне не вызначана Месца пакуль ня вызначанае Змяніць празрыстасць (0 - празрысты, 255 - непразрысты) - Перапыніць загрузку файла? - Дзякуй за карыстаньне OsmAnd. Каб карыстацца ўсімі магчымасьцямі праграмы, вам патрэбныя некаторыя пазасеціўныя зьвесткі для вашага рэгіёну. Іх можна зладаваць праз \'Налады\' → \'Кіраваць файламі мапаў\'. Пасьля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць цікавосткі і грамадзкі транспарт. - Базавая мапа неабходная для карэктнай працы праграмы і аўтаматычна была абраная для загрузкі. + Перапыніць cьцягваньне файла? + Дзякуй за карыстаньне OsmAnd. Каб карыстацца ўсімі магчымасьцямі праграмы, вам патрэбныя некаторыя пазасеціўныя зьвесткі для вашага рэгіёну. Іх можна cьцягнуць праз \'Налады\' → \'Кіраваць файламі мапаў\'. Пасьля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць цікавосткі і грамадзкі транспарт. + Базавая мапа неабходная для карэктнай працы праграмы і аўтаматычна была абраная для cьцягваньня. Нічога не знойдзена. Калі вы не знайшлі свой рэгіён, вы можаце стварыць мапу самастойна (гл. http://osmand.net). Сеціўныя і растравыя мапы Аўтаномныя мапы (вэктарныя) - Ладаваньне і кіраваньне файламі мапаў, што захоўваюцца на вашым прыстасаваньні + Сьцягваньне і кіраваньне файламі мапаў, што захоўваюцца на вашым прыстасаваньні Актывуйце модуль онлайн мапаў, каб выбіраць розныя крыніцы для мапаў Сеціўныя і растравыя мапы - Карыстацца сеціўнымі мапамі (зладаваць і захоўваць на картцы SD) + Карыстацца сеціўнымі мапамі (cьцягнуць і захоўваць на картцы SD) Сеціўныя мапы Настройка крыніц анлайн або кэшаваных растравых мапаў Налады мапы @@ -645,7 +645,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Для распрацоўшчыкаў OsmAnd Хуткая адмалёўка Пратэставаць галасавыя падказкі - Для бягучай мясцовасьці мапа адсутнічае. Вы можаце загрузіць мапу з дапамогай меню Налады (Кіраваць файламі маапў) або пераключыцца на выкарыстаньне сеткавых мапаў. + Для бягучай мясцовасьці мапа адсутнічае. Вы можаце cьцягнуць мапу з дапамогай меню Налады (Кіраваць файламі мапаў) або пераключыцца на выкарыстаньне сеткавых мапаў. Змены 0.7.2: ↵ \n\t - Хуткі рэндэрынг для ўсіх прылад ↵ \n\t - Лакальнае рэдагаванне POI @@ -725,17 +725,16 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Ужываць флюарэсцэнтныя колеры для трэкаў і шляхоў Аўтаномнае рэдагаваньне Заўсёды выкарыстоўваць аўтаномнае рэдагаваньне - Змены ў 0.7.1 : ↵ - \n\t - Лакальнае рэдагаванне POI ↵ - \n\t - Параметры адсочваньня - перыядычная перадача каардынатаў у вэб-сэрвіс (як наладзіць вэб-сэрвіс адсочваньня - чытайце ў HowTo) ↵ - \n\t - Паказ бягучага сьледу на мапе↵ - \n\t - Вызначэнне напрамка руху: паведамленне \'Зрабіце разварот\' паказваецца і аб\'яўляецца, калі вы рухаецеся ў процілеглым кірунку, або прапусцілі паварот ↵ - \n\t - Новае галасавое паведамленне \'Маршрут пералічаны\' ↵ - \n\t - Візуальная індыкацыя бліжэйшага павароту, у межах 100 м стрэлка кірунку мяняе колер ↵ - \n\t - Актуальнасць дэактываваных індэксных файлаў таксама паказваецца ў меню Загрузка, цёмна-блакітным або цёмна-зялёным ↵ - \n\t - Іншыя змены ↵ - - Зьмены POI у праграме не ўплываюць на зладаваныя файлы мапы, зьмены захоўваюцца толькі ў лякальныя файлы. + "Змены ў 0.7.1 : ↵ +\n\t - Лакальнае рэдагаванне POI ↵ +\n\t - Параметры адсочваньня - перыядычная перадача каардынатаў у вэб-сэрвіс (як наладзіць вэб-сэрвіс адсочваньня - чытайце ў HowTo) ↵ +\n\t - Паказ бягучага сьледу на мапе↵ +\n\t - Вызначэнне напрамка руху: паведамленне \'Зрабіце разварот\' паказваецца і аб\'яўляецца, калі вы рухаецеся ў процілеглым кірунку, або прапусцілі паварот ↵ +\n\t - Новае галасавое паведамленне \'Маршрут пералічаны\' ↵ +\n\t - Візуальная індыкацыя бліжэйшага павароту, у межах 100 м стрэлка кірунку мяняе колер ↵ +\n\t - Актуальнасць дэактываваных індэксных файлаў таксама паказваецца ў меню Сьцягнуць, цёмна-блакітным або цёмна-зялёным ↵ +\n\t - Іншыя змены ↵ " + Зьмены POI у праграме не ўплываюць на cьцягнутыя файлы мапаў, зьмены захоўваюцца толькі ў лякальныя файлы. Перадача … {0} POI/Памылкі былі адасланы Адаслаць усё @@ -924,7 +923,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Дэактываваць Выдаліць Перачытаць з карткі SD - Зладаваць + Сьцягнуць Зьвесткі цікавосткаў Адрас Зьвесткi грамадзкага транспарту @@ -1111,7 +1110,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві набярыце каб фільтраваць Дысплей высокай рэзалюцыі Не расьцягваць (з размыццём) растравыя мапы на дысплеях з высокай шчыльнасьцю - Зладаваць + Сьцягнуць Шукаць грамадзкi транспарт Вынiк пошуку транспарту (няма цэлі): Вынiк пошуку транспарту ({0} да цэлі): @@ -1255,7 +1254,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Абраць сеціўны ці пазасеціўны сэрвіс навігацыі Сэрвіс навігацыі Каталёг на SD-карце недаступны для захоўваньня! - Download {0} - {1} ? + Сьцягнуць {0} - {1} ? Лакальная мапа для {0} ужо існуе ({1}). Хочаце яе абнавіць ({2})? Адрас Загрузка пасьпяховая @@ -1616,7 +1615,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\t* Карта не губляе блакавання пазіцыі пасля перапыненняў \n\t* Уключае фонавы рэжым падчас навігацыі " Гэты модуль паказвае ізалініі вышынь на картах OsmAnd. Глабальныя дадзеныя (паміж 70 градусамі на поўначы і 70 градусамі на поўдні) грунтуюцца на вымярэннях SRTM (Shuttle Radar Topography Mission) і ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), дадзеных інструмента візуалізацыі Terra, флагманскага спадарожніка сістэмы назірання Зямлі ад NASA. ASTER - гэта вынік сумеснай працы NASA, міністэрства эканомікі Японіі, міністэрства гандлю і прамысловасці Японіі (METI), агенцтва касмічных сістэм Японіі (J-spacesystems). - Модуль дазваляе загружаць дадзеныя ізаліній вышынь (\'Налады\' → \'Кіраваньне файламі мапаў\' → \'Спампаваць\' → Выберыце пажаданы тып карты). + Модуль дазваляе cьцягваць дадзеныя ізаліній вышынь (\'Налады\' → \'Кіраваньне файламі мапаў\' → \'Сьцягнуць\' → Выберыце пажаданы тып мапы). Модуль OsMoDroid - пашырэньне для OsmAnd, што выкарыстоўвае праграму OsModroid для сеткавага адсочваньня. Інфармацыю аб сэрвісе можна знайсьці на сайце http://esya.ru. Большасць GPS прылад паказваюць вышыню односна элліпсоіда WGS84, для вызначэння вышыні над узроўнем мора неабходна правесці карэкцыю, якая залежыць ад вашага месцазнаходжання. ↵ → → \n\nКаб выправіць значеньне вышыні выкарыстоўваецца праекцыя EGM96. ↵ @@ -1631,9 +1630,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Як хутка вы хочаце чуць паведамленьне пра прыбыцьцё? "Актуальныя картаграфічныя дадзеныя вельмі важныя для аўтаномнага прагляду мапы і адраснага пошуку. OsmAnd мае ўбудаваны мэнэджэр файлаў мапаў, які можа правяраць наяўнасць абнаўленьняў для лакальных мапаў. -\n\nКаб выканаць загрузку мапаў абярыце пункт меню \'Налады\' → \'Кіраваньне файламі мапаў\' → \'Загрузка\'. ↵ -\n\nПасля таго як сьпіс рэгіёнаў будзе загружаны зь Інтэрнэту, націсьніце на любы пункт для загрузкі або абнаўленьня файла. Звярніце ўвагу, селектар тыпу файла знаходзіцца ў верхняй частцы экрана, каб выбраць патрэбны тып файлаў для загрузкі (карты, слаі рэльефу і г.д.) ↵ -\n\nВы можаце паказаць толькі дадзеныя прысутныя на прыстасаваньні \'Налады\' → \'Загружаныя\', каб пабачыць абнаўленьні толькі для дадзеных, загружаных на прыстасаваньне. ↵ +\n\nКаб cьцягнуць мапы абярыце пункт меню \'Налады\' → \'Кіраваньне файламі мапаў\' → \'Сьцягнуць\'. ↵ +\n\nПасля таго як сьпіс рэгіёнаў будзе cьцягнуты зь Інтэрнэту, націсьніце на любы пункт для cьцягваньня або абнаўленьня файла. Звярніце ўвагу, селектар тыпу файла знаходзіцца ў верхняй частцы экрана, каб выбраць патрэбны тып файлаў для cьцягванья (мапы, слаі рэльефу і г.д.) ↵ +\n\nВы можаце паказаць толькі дадзеныя прысутныя на прыстасаваньні \'Налады\' → \'Сьцягнутыя\', каб пабачыць абнаўленьні толькі для дадзеных, загружаных на прыстасаваньне. ↵ \n\n\t* \'Зялёным\' паказваюцца дадзеныя, якія не патрабуюць абнаўленьня ↵ \n\t* \'Блакітным\' - наяўныя абнаўленьні ↵ \n\t* Элементы паказаныя курсівам - дэактываваныя дадзеныя на прыстасаваньні " @@ -1803,11 +1802,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Выбраць для паказу Няма чаго сьцягваць, калі-ласка, праверце ваша Інтэрнэт-злучэньне. Не ўдалося ўвайсьці ў OsMo - Загружана %1$s кропак OsMo. + Сьцягнута %1$s кропак OsMo. Аўтаматычнае падключэньне да службы пасьля запуску праграмы Аўтаматычнае падключэньне Служба OsMo - Загружаны %1$s сьлед OsMo. + Сьцягнуты %1$s сьлед OsMo. Уваход па запрашэньнi Калі ласка, прачытайце перад стварэньнем групы! " - Усе створаныя групы з\'яўляюцца агульнымі! Калі вы хочаце заставацца ананімным, падключайце прыладу наўпрост праз Tracker-ідэнтыфікатар. @@ -1879,7 +1878,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Аўтамабіль Ровар Пешаход - Спампаваць мапы, што адсутнічаюць, %1$s (%2$d МБ)? + Сьцягнуць мапы, што адсутнічаюць, %1$s (%2$d МБ)? Больш… Усе Кропкі шляху @@ -1942,7 +1941,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Аўтобусныя маршруты Маршрутныя таксі Маршруты трамваяў і цягнікоў - Выбраць на мапе + Выбраць на мапе… Пазьбягаць дарогі… Схаваць Уключыць экран @@ -1963,8 +1962,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Выкарыстоўваць апаратнае паскарэньне OpenGL (можа не працаваць на некаторых прыстасаваньнях) Усе файлы ў актуальным стане Скасаваць - Немагчыма спампаваць. Калі ласка, праверце ваша Інтэрнэт-злучэньне. - Усе загрузкі + Немагчыма cьцягнуць. Калі ласка, праверце ваша Інтэрнэт-злучэньне. + Усе cьцягваньні Абнаўленьні Лякальны Зона @@ -1972,9 +1971,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві На ўсход Мова мапы Прыпынкі транспарту - Вы хочаце спампаваць якія-небудзь мапы? - Вы зладавалі %1$s мапы - Спампаваць новую мапу + Вы хочаце cьцягнуць якія-небудзь мапы? + Вы cьцягнулі %1$s мапы + Сьцягнуць новую мапу Кіраваць Галасавыя падказкі Аранжавы From 19ef8af84f6c6d19471904bed49f7eb24142fbda Mon Sep 17 00:00:00 2001 From: jan madsen Date: Thu, 8 Jan 2015 08:28:32 +0100 Subject: [PATCH 334/372] Translated using Weblate (Danish) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index b048d4f70e..95bd8de84f 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1829,7 +1829,7 @@ Trolleybusruter Busruter Tog- og sporvognsruter - Vælg på kort + Vælg på kort… Undgå veje… Skjul Tænd for skærmen From 031d2f1f76b0a1878e8d1bae44117b82b90494c4 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Thu, 8 Jan 2015 09:07:14 +0100 Subject: [PATCH 335/372] Translated using Weblate (French) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 3c1b9c81b8..b4186a603f 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -1847,7 +1847,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Voies de tramway Voies partagées pour les taxi Itinéraires de tramway et train - Sélectionnez sur la carte + Sélectionnez sur la carte… Évitez les routes… Masquer Allumer l\'écran From 9804215e917b5dfe64389b38abed91f2309b69e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Thu, 8 Jan 2015 11:10:13 +0100 Subject: [PATCH 336/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-hu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index dbe4268b77..725bf96773 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1756,7 +1756,7 @@ Mutat Térképi tartalom ennek a közelében - Kiválasztás a térképen + Kiválasztás a térképen… Utak elkerülése… Villamos- és vasútvonalak Vasútvonalak From cd3533977b0912c282a0af198181688a817814e0 Mon Sep 17 00:00:00 2001 From: Jur Kis Date: Thu, 8 Jan 2015 07:45:39 +0100 Subject: [PATCH 337/372] Translated using Weblate (Lithuanian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-lt/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index ca6d671487..3969db3592 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -1832,7 +1832,7 @@ Troleibusų maršrutai Tramvajų maršrutai Traukinių maršrutai - Pasirinkite žemėlapį + Pasirinkite žemėlapyje… Vengti kelių… Tramvajų ir traukinių maršrutai Maršrutinis taksi From 245de949f6d89cf31758d7b721d475f7ab029c47 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Thu, 8 Jan 2015 11:25:19 +0100 Subject: [PATCH 338/372] Translated using Weblate (Swedish) Currently translated at 99.4% (1587 of 1595 strings) --- OsmAnd/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 1844914ff2..8540b37a93 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1720,7 +1720,7 @@ Trådbusslinjer Busslinjer Spårvagns- och tåglinjer - Välj på kartan + Välj på kartan … Undvik vägar … Dölj Slå på skärmen From c3aca8c4ea50f5a0bf6521e6219219a9efbea21f Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Thu, 8 Jan 2015 12:09:56 +0100 Subject: [PATCH 339/372] Translated using Weblate (Italian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-it/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 08d1647880..e24dd7518a 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2043,4 +2043,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Mostra i passaggi a livello Mostra gli attraversamenti pedonali Annuncia gli attraversamenti pedonali - + Preimpostato + From f357183b12a5f4b0bf5d27a9c28378ac317f5816 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Thu, 8 Jan 2015 12:22:10 +0100 Subject: [PATCH 340/372] Translated using Weblate (Russian) Currently translated at 94.1% (575 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 37297d87b3..6ba6a09fb7 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -639,4 +639,7 @@ Радар Аквариум + Съезд + + Башня From 0b9b31a9b7ddccbafbd3cc2961890f20c89f4690 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 12:20:12 +0100 Subject: [PATCH 341/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-be/strings.xml | 73 ++++++++++++++++---------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 1e17eda12c..25d0b147c0 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -756,7 +756,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\t- Пазасеткавыя зьвесткі вікіпэдыі з артыкуламі \n\t- Абноўленыя мапы \n\t- Іншыя невялікія пашырэньні " - Гэтая бясплатная версія OsmAnd абмяжоўваецца %1$s загрузкамі і не падтрымлівае аўтаномныя артыкулы Вікіпедыі. + Гэтая бясплатная вэрсія OsmAnd абмяжоўваецца %1$s cьцягваньнямі і не падтрымлівае аўтаномныя артыкулы Вікіпэдыі. Бясплатная вэрсія Паказваць апісаньні POI Паўночная Амэрыка @@ -798,7 +798,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\t* \'Па кірунку руху\' - Карта будзе паварочвацца ў адпаведнасці з напрамкам Вашага руху. Зверху - кірунак руху. ↵ \n\t* \'Па кірунку компаса\' - Карта будзе паварочвацца так, каб сумясціць поўнач карты і паўночны напрамак (выкарыстоўваюцца паказанні компаса ў прыладзе). ↵ - "Загрузка скончана. ↵ + "Сьцягваньне скончана. ↵ \n\t\n\tАктывацыя мапаў праз \'Меню\' → \'Мапа\' → \'Крыніца мапы ...\' → \'Оффлайн вектарныя мапы\". ↵ → " Рэжым дзень/ноч "Для лакальных вектарных карт можна змяняць выгляд у залежнасці ад часу сутак: днём (светлы), ноччу (цёмны). Начны рэжым бяспечны для выкарыстання кіроўцамі ў цемры ↵ @@ -815,8 +815,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\nПра памылкі на карце можна неадкладна паведамляць праз \'Памылкі OSM\' і супольнасць OSM зможа іх хутка выправіць. Для дадання паведамлення пра памылку скарыстайцеся камандай \'Памылка ў OSM\' з кантэкстнага меню карты. Дадайце апісанне праблемы і адпраўце яе націснуўшы \'Дадаць\'. ↵ \n\nOsmAnd падтрымлівае кэшаванне вашых правак, калі злучэнне з інтэрнэтам няма (гл. адпаведныя наладкі), але для перадачы OSM POI і справаздач пра памылкі ў OSM вам трэбна інтэрнэт злучэнне. ↵ - Няма вольнага месца каб зладаваць %1$s MB (вольна: %2$s). - Вольнага месца зараз {2} MB! Зладаваць {0} файлы ({1} MB)? + Няма вольнага месца каб сьцягнуць %1$s МБ (вольна: %2$s). + Вольнага месца зараз {2} МБ! Сьцягнуць {0} файл(аў) ({1} МБ)? Навігацыя "Каб атрымаць маршрут да патрэбнага месца, вы можаце націснуць і трымаць пальцам карту ў патрэбным месцы (потым выбраць «Маршрут у» ў вакенцы маркера) або «Маршруты» пасля выбару любога пункта ў выніках пошуку або закладках. ↵ \n\nМесца прызначэньня будзе пазначана сьцяжком, таксама OsmAnd пакажа адлегласць да яго і напрамак (аранжавым трохвугольнікам). ↵ @@ -872,7 +872,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Файл POI \'%1$s\' залішні і можа быць выдалены. Лякальны файл для падтрымкі зьменаў у POI ня знойдзены і ня можа быць створаны. Абнавіць да OsmAnd+ - Сэрвер утрымлівае файлы мапаў, якія не сумяшчальныя з вашай вэрсіяй праграмы. Каб зладаваць і карыстацца імі трэба абнавіць праграму да новай вэрсіі. + Сэрвер утрымлівае файлы мапаў, якія не сумяшчальныя з вашай вэрсіяй праграмы. Каб сьцягнуць і карыстацца імі трэба абнавіць праграму да новай вэрсіі. Пераназваць Паказаць на мапе Сеткавы Nominatim @@ -906,8 +906,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Назва Катэгорыя Не, дзякуй - Няма асноўнай мапы сьвету (якая пакрывае ўвесь сьвет на малых маштабах). Каб мець поўнае асяродзьдзе трэба зладаваць World_basemap_x.obf. - Няма пазасеціўных зьвестак на картцы SD. Каб карыстацца мапай па-за сеткай, трэба іх зладаваць. + Няма асноўнай мапы сьвету (якая пакрывае ўвесь сьвет на малых маштабах). Каб мець поўнае асяродзьдзе трэба сьцягнуць World_basemap_x.obf. + Няма пазасеціўных зьвестак на картцы SD. Каб карыстацца мапай па-за сеткай, трэба іх сьцягнуць. \n\nНаціснуць і трымаць для наладаў @@ -965,7 +965,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Канал телефанаваньня Канал апавяшчэньня Мэдыя/музычны канал - Праграма не можа спампаваць слой мапы %1$s, паспрабуйце пераўсталяваць яго. + Праграма не можа сьцягнуць слой мапы %1$s, паспрабуйце пераўсталяваць яе. Зьмяніць празрыстасць накладзенага слою Празрыстасць накладаньня Зьмяніць празрыстасць асноўнай мапы @@ -1071,13 +1071,13 @@ OsmAnd мае адкрыты зыходны код і актыўна разві У вас ўсталяваная папярэдняя версія OsmAnd. Усе лакальныя дадзеныя падтрымліваюцца новай версіяй. Але захаваныя кропкі трэба экспартаваць з папярэдняй версіі і імпартаваць у новую. Зборка {0} пасьпяхова ўсталявана ({1}). - Загружаецца зборка… + Сьцягваецца зборка… Хочаце ўсталяваць OsmAnd - {0} з {1} {2} МБ? Не ўдалося атрымаць сьпіс зборак OsmAnd Загружаюцца зборкі OsmAnd… Выберыце зборку OsmAnd для ўстаноўкі Праграма статуса GPS не ўсталяваная. Пашукаць яе ў Market? - Галасавыя каманды не даступныя. Калі ласка, перайдзіце ў \"Налады\" → \"Агульныя\" → \"Галасавыя дадзеныя\" і абярыце ці спампуйце пакет галасавых падказак. + Галасавыя каманды не даступныя. Калі ласка, перайдзіце ў \"Налады\" → \"Агульныя\" → \"Галасавыя дадзеныя\" і абярыце ці сьцягніце пакет галасавых падказак. Галасавыя падказкі не абраныя Дзень Ноч @@ -1085,18 +1085,18 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Сэнсар сьвятла Выберыце правіла пераключэньня рэжыму дзень/ноч Рэжым дзень/ноч - Спампаваць {0} файл(ы) ({1} MB)? + Сьцягнуць {0} файл(ы) ({1} МБ)? {0} абрана - Зладаванае + Сьцягнутае Прыбраць вылучэньне ўсіх Вылучыць усе Абнавіць Найхутчэйшы шлях Пазначыць каб разьлічваць найхутчэйшы шлях, ці зьняць пазнаку для найкарацейшага шляху - На маштабе {0} загрузіць {1} фрагментаў ({2} МБ) - Спампаваць мапу + На маштабе {0} сьцягнуць {1} фрагмэнтаў ({2} МБ) + Сьцягнуць мапу Выберыце максімальнае павелічэньне для папярэдняй загрузкі - Гэтая мапа не можа быць загружана + Гэтую мапу нельга сьцягнуць Бесперапынная адмалёўка Паказваць бесперапынную адмалёўку замест выявы цалкам Памылка пры адмалёўцы абранай вобласьці @@ -1143,7 +1143,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Экспартаваць Памылка пры загрузцы GPX Даслаць справаздачу - На SD-карце не знойдзена лакальных дадзеных для рэгіёнаў. Спампаваць рэгіёны з Інтэрнэту. + На SD-карце не знойдзена лякальных дадзеных для рэгіёнаў. Сьцягнуць рэгіёны з Інтэрнэту. Увядзіце запыт для пошуку POI Усе Маршрут транспарту @@ -1198,7 +1198,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Развярніцеся і рухайцеся Рухайцеся Далей - Зладаваць рэгіёны + Сьцягнуць рэгіёны Пошук сігналу… Шукаць побач з бягучым цэнтрам мапы Шукаць паблізу @@ -1249,7 +1249,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Пазасеціўны пошук Сеціўны пошук Максімальнае павелічэньне онлайн мапаў - Выберыце максімальны ўзровень павелічэньня для загрузкі онлайн растравых мапаў + Выберыце максімальны ўзровень павелічэньня для сьцягваньня растравых мапаў з Інтэрнэту Агульная адлегласьць %1$s, час у дарозе %2$d г. %3$d хв. Абраць сеціўны ці пазасеціўны сэрвіс навігацыі Сэрвіс навігацыі @@ -1257,11 +1257,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Сьцягнуць {0} - {1} ? Лакальная мапа для {0} ужо існуе ({1}). Хочаце яе абнавіць ({2})? Адрас - Загрузка пасьпяховая + Пасьпяхова сьцягнута Адбылася памылка ўводу/вываду - Ладаваньне… - Ладаваньне… - Зладоўваем сьпіс даступных рэгіёнаў… + Сьцягваньне… + Сьцягваньне… + Сьцягваецца сьпіс даступных рэгіёнаў… Сьпіс даступных рэгіёнаў ня быў зладаваны з osmand.net. Паказаць на мапе Захаваная кропка была зьменена @@ -1302,8 +1302,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Скончана Перачытаць лакальныя вектарныя мапы з SD Перачытаць лакальныя дадзеныя - Загрузіць або абнавіць мапы для лакальнага выкарыстаньня з Інтэрнэту - Зладаваць пазасеткавыя зьвесткі + Сьцягнуць або абнавіць мапы для лякальнага выкарыстаньня з Інтэрнэту + Сьцягнуць пазасеткавыя зьвесткі Выкарыстоўваць Інтэрнэт для разьліку маршруту Выкарыстоўваць онлайн навігацыю Лагін і пароль для Openstreetmap.org (OSM) @@ -1347,7 +1347,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Мапа Налады Паказаць GPS каардынаты на мапе - Выкарыстоўваць Інтэрнэт, каб спампаваць фрагмэнты мапы, што адсутнічаюць + Выкарыстоўваць Інтэрнэт, каб сьцягваць фрагмэнты мапы, што адсутнічаюць Навігацыйная праграма Выхад Мапа @@ -1651,18 +1651,17 @@ OsmAnd мае адкрыты зыходны код і актыўна разві "Карты і слаі можна мяняць праз \'Меню\' → \'Налада мапы\'. ↵ \n\nУ пункце \'Крыніцы карт...\' можна выбраць прадусталяваныя вектарныя карты (звычайна патрэбныя для аўтаномнай навігацыі), або папярэдне указаныя (сеткавыя або кэшаваныя) крыніцы растравых карт (для выкарыстання неабходна ўключыць модуль \'Сеткавыя карты\') або самастойна створаныя карты (напрыклад, з дапамогай OsmAndMapCreator для ПК). ↵ \n\nOsmAnd таксама падтрымлівае адвольныя крыніцы карыстальніка. ↵ " - Змены ў 0.6.7: ↵ - \n\t- Менеджэр лакальных дадзеных (сцягванне, выдаленне, актывацыя і дэактывацыя дадзеных непасрэдна ў OsmAnd) ↵ - \n\t- Закладкі і групы (катэгарызацыя, выдаленне, кіраванне закладкамі) ↵ - \n\t- Агляд GPX у праграме (прагляд інфармацыі пра сьлед, адлегласць, сярэдняя хуткасць, вышыня, г.д.) ↵ - \n\t- Навігацыя па GPX (больш параметраў, працяг навігацыі пасля збою, падтрымка руху па крузе ) ↵ - \n\t- Магчымасць захавання маршруту як следу GPX для лакальнага выкарыстання ↵ - \n\t- Палепшаны GPX-маніторынг (адкіданьне недакладнага становішча і захаванне дакладнасці/вышыні/хуткасці) ↵ - \n\t- Загрузка GPX для выкарыстання супольнасцю OSM (http://download.osmand.net/gpx/) ↵ - \n\t- Паляпшэнне вектарнай адмалёўкі ↵ - \n\t- Паляпшэнне рухавічка TTS (паведамленне дакладнай адлегласці, можна і ў мілях) ↵ - \n\t- Выпраўленні памылак ↵ - + "Змены ў 0.6.7: ↵ +\n\t- Менеджэр лакальных дадзеных (сьцягванне, выдаленне, актывацыя і дэактывацыя дадзеных непасрэдна ў OsmAnd) ↵ +\n\t- Закладкі і групы (катэгарызацыя, выдаленне, кіраванне закладкамі) ↵ +\n\t- Агляд GPX у праграме (прагляд інфармацыі пра сьлед, адлегласць, сярэдняя хуткасць, вышыня, г.д.) ↵ +\n\t- Навігацыя па GPX (больш параметраў, працяг навігацыі пасля збою, падтрымка руху па крузе ) ↵ +\n\t- Магчымасць захавання маршруту як следу GPX для лакальнага выкарыстання ↵ +\n\t- Палепшаны GPX-маніторынг (адкіданьне недакладнага становішча і захаванне дакладнасці/вышыні/хуткасці) ↵ +\n\t- Загрузка GPX для выкарыстання супольнасцю OSM (http://download.osmand.net/gpx/) ↵ +\n\t- Паляпшэнне вектарнай адмалёўкі ↵ +\n\t- Паляпшэнне рухавічка TTS (паведамленне дакладнай адлегласці, можна і ў мілях) ↵ +\n\t- Выпраўленні памылак ↵ " Праблема з падключэньнем OsMo: Спыніць сэсыю OsMo Запусьціць сэсыю OSMo From 38f9bdbc7e8e3513813410a62ba2d4549f0444f5 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Thu, 8 Jan 2015 12:20:27 +0100 Subject: [PATCH 342/372] Translated using Weblate (Italian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-it/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index e24dd7518a..567e415562 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -509,7 +509,7 @@ Scarica le regioni Grazie di utilizzare OsmAnd. Per molte delle caratteristiche dell\'applicazione, hai bisogno dei dati offline locali, che possono essere scaricati da \'Impostazioni\'→\'Gestisci i file mappe\'. Sarà poi possibile visualizzare mappe, cercare indirizzi, PDI, e trovare trasporti pubblici. Ricerca segnale GPS… - Ricerca vicino all\'ultima posizione sulla mappa + Ricerca vicino all\'attuale centro della mappa Ricerca vicino Orientamento predefinito Verticale @@ -1444,7 +1444,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Utilizza il sensore magnetico per determinare il valore della bussola invece del sensore di orientamento Utilizza il sensore magnetico (bussola) Dati isocline - Usare il filtro di Kalman per evitare aberrazioni della bussola + Riduce il rumore delle letture della bussola ma introduce dell\'inerzia Uso del filtro di Kalman Modalità di accesso facilitato: selezionare prima la destinazione Prego attendere il termine dell\'operazione @@ -1859,7 +1859,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Deseleziona Seleziona per visualizzarlo Destinazione - Niente da scaricare, per favore controllare la connessione internet. + Non è stato trovato niente da scaricare, per favore controllare la connessione internet. Scaricati %1$s punti OsMo. Connettiti al servizio automaticamente dopo l\'accensione Connesione automatica @@ -1996,7 +1996,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Percorsi in filobus Percorsi in bus Percorsi tram e treno - Seleziona nella mappa + Seleziona nella mappa… Evita strade … Nascondi Accendi lo schermo @@ -2036,7 +2036,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Arancione Atlante strade tedesche Atlante strade americane - Non usare il calcolo del percorso v1.9 + Non usare le regole di calcolo del percorso v1.9 Non usare le regole di calcolo del percorso introdotte nella v1.9 Passaggio a livello Attraversamento pedonale From 3a6baf43659e74311d34b265f242fc3cb2537616 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 12:22:17 +0100 Subject: [PATCH 343/372] Translated using Weblate (Russian) Currently translated at 93.9% (574 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 6ba6a09fb7..b7eb8d80d4 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -641,5 +641,5 @@ Аквариум Съезд - Башня + From ca191492e3ba68c00457d54f12e050f7c4cc29ed Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Thu, 8 Jan 2015 12:24:59 +0100 Subject: [PATCH 344/372] Translated using Weblate (Russian) Currently translated at 95.2% (582 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index b7eb8d80d4..1314d2015e 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -556,11 +556,11 @@ Бакен - + Бакен безопасности Бакен специального назначения Причал - + Мост Знак изолированной опасности @@ -568,7 +568,7 @@ Специальный буй - + Отметка расстояния @@ -641,5 +641,10 @@ Аквариум Съезд - + + Мачта + Животное (аттракцион) + Горка + Летние санки + Док From e00bcb40c17b469cc71def529bff649df2fcc626 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Thu, 8 Jan 2015 12:22:54 +0100 Subject: [PATCH 345/372] Translated using Weblate (Italian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-it/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 567e415562..c243262249 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -141,7 +141,7 @@ Non definito Fissato Posizione corrente… - Ultima vista mappa + Attuale centro della mappa Origine: Cerca nelle vicinanze Novità nella versione 0.6.7: @@ -353,7 +353,7 @@ m Il formato dati mappa \'\'{0}\'\' è deprecato e non è supportato Servizi automobile - Tutti i PDI più vicini + PDI più vicini Filtro personalizzato Alimentari Turistico From d4e71e7f317591122dda4600eca90cd527dace9b Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 12:25:20 +0100 Subject: [PATCH 346/372] Translated using Weblate (Russian) Currently translated at 95.5% (584 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 1314d2015e..d01f21b05f 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -569,9 +569,9 @@ Специальный буй Отметка расстояния - + Сухой док - + Плавучий док Сигнал при тумане Гавань From 2bbc697fe073670a5e57296e835adc22339eb400 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Thu, 8 Jan 2015 12:26:49 +0100 Subject: [PATCH 347/372] Translated using Weblate (Russian) Currently translated at 95.9% (586 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index d01f21b05f..fc7b7fa689 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -575,7 +575,7 @@ Сигнал при тумане Гавань - + Ориентир @@ -586,7 +586,7 @@ Радиостанция - + Сигнальная станция Сигнал опасности From 71fe0e15b3a2578b8376c565a9eb4429102d6a67 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 12:27:21 +0100 Subject: [PATCH 348/372] Translated using Weblate (Russian) Currently translated at 96.0% (587 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index fc7b7fa689..051df8b9cd 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -588,7 +588,7 @@ Радиостанция Сигнальная станция Сигнал опасности - + Лодочная станция Кораблекрушение From dd865fe57d51da62b76f577995ad1fe71221a422 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Thu, 8 Jan 2015 12:27:42 +0100 Subject: [PATCH 349/372] Translated using Weblate (Russian) Currently translated at 96.2% (588 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 051df8b9cd..039588af41 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -590,7 +590,7 @@ Сигнал опасности Лодочная станция - + Скала Кораблекрушение Военный аэродром From 3cf1aeaa95d7f5a9408dd2370281e8874dcf8359 Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Thu, 8 Jan 2015 12:49:13 +0100 Subject: [PATCH 350/372] Translated using Weblate (Polish) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-pl/strings.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 4c193b32e6..d6a088f8aa 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -52,7 +52,7 @@ Niezdefiniowane Ustalono Obecna pozycja… - Ostatni widok mapy + Aktualny środek mapy Szukaj w pobliżu: Szukaj w pobliżu "Zmiany dla wersji 0.6.7: \n\t- możliwość pobrania map bezpośrednio z poziomu aplikacji (pobierz, usuń, zrób kopię zapasową danych bezpośrednio w OsmAnd) \n\t- ulubione punkty i grupy (kategoryzuj, usuń, zarządzaj ulubionymi) \n\t- GPX Explorer w aplikacji (see tracks, distance, average speed, elevation, etc.) \n\t- nawigacja w oparciu o track GPX (useful options, continue navigation after crash, supports roundabouts) \n\t- możliwość zapisania trasy jako ślad GPX do wykorzystania w trybie offline \n\t- poprawiono monitorowanie GPX (filtruje niektóre nieprecyzyjne położenia i zapisuje precyzję/wysokość/prędkość) \n\t- możliwość wysłania śladu GPX dla społeczności OSM (http://download.osmand.net/gpx/) \n\t- usprawnienie rendera wektorowego \n\t- usprawnienie mechanizmu TTS (dokładny dystans) \n\t- poprawki różnych błędów " @@ -418,7 +418,7 @@ Pobierz region Dziękujemy za korzystanie z OsmAnd. Do wykorzystania większości funkcji aplikacji potrzebujesz danych o wybranym regionie, które pobierzesz w \'Ustawienia\' → \'Zarządzaniu plikami map\'. Dzięki nim będziesz mógł przeglądać mapy, wyszukiwać adresy, POI i transport publiczny. Wyszukiwanie sygnału… - Szukaj w pobliżu ostatniej pozycji + Szukaj w pobliżu aktualnego środka mapy Szukaj w pobliżu Jak w urządzeniu Pionowo @@ -1236,7 +1236,7 @@ Użyj czujnika pola magnetycznego, aby określić kierunek kompasu Użyj czujnika magnetycznego (kompas) Dane poziomic - Użyj filtru Kalmana, aby uniknąć odchyleń kompasu + Redukuje szumy w odczytach kompasu, ale zwiększa bezwładność Użyj filtru Kalmana Tryb ułatwień dostępu: wybierz najpierw punkt docelowy Zaczekaj aż bieżące zadanie zostanie zakończone @@ -1934,7 +1934,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant W odległości Włącz ekran Włącz ekran urządzenia podczas zbliżania się do skrętu - Zaznacz na mapie + Zaznacz na mapie… Unikaj dróg… Trasy tramwajowe i kolejowe "Zmiany w 1.9: * Aktualizacja stylów mapy z renderowaniem warstw nawierzchni drogi, transportu i symboli turystycznych * Wyszukiwanie punktów POI wzdłuż trasy * Zaznaczanie nieprzejezdnej drogi dla danego przejazdu * Ułatwienia pobrania i aktualizacji mapy * Otrzymywanie powiadomień wizualnych i audio podczas zbliżania się do punktu * Drukuj informacje o trasie i manewrach * Wsparcie dla asystenta pasa ruchu * Wsparcie Android Wear * Dużo zmian UI * Oddzielne powiększenie rozmiaru dla tekstu na mapie * Specjalne powiadomienia dźwiękowe w przypadku zjechania z trasy * Funkcjonalności logowania do Osmo * Poprawienie niezgodności wersji OsMo " @@ -1986,4 +1986,5 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Pokazuj przejazdy kolejowe Pokazuj przejścia dla pieszych Informuj o przejściach dla pieszych - + Domyślne + From bdafb288ec4c3c5b8c157ae37e0215dbb03c4602 Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 13:25:03 +0100 Subject: [PATCH 351/372] Translated using Weblate (Belarusian (latin)) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-be-rBY/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml index 8e9d91eb6b..29c7123cc8 100644 --- a/OsmAnd/res/values-be-rBY/strings.xml +++ b/OsmAnd/res/values-be-rBY/strings.xml @@ -1804,4 +1804,5 @@ Pamier fotazdymka z ubudavanaj kamiery Niapravіĺny farmat: %s Vydalіć usie - +Pa zmoŭčańni + From de522efd0f04cb111adfc721ee3e195b5c0f91b2 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 8 Jan 2015 18:16:11 +0200 Subject: [PATCH 352/372] Fixed issue with all words being capitalized in add favorite --- OsmAnd/res/layout/favourite_edit_dialog.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favourite_edit_dialog.xml index fa7fff461f..3ee8fc67dc 100644 --- a/OsmAnd/res/layout/favourite_edit_dialog.xml +++ b/OsmAnd/res/layout/favourite_edit_dialog.xml @@ -17,7 +17,6 @@ android:id="@+id/Name" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:inputType="textCapWords" android:paddingLeft="3dp" android:selectAllOnFocus="true" /> From efdfdafee45b53327464a12424ae3cdf569e37dd Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 13:23:27 +0100 Subject: [PATCH 353/372] Translated using Weblate (Belarusian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-be/strings.xml | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 25d0b147c0..cbe8a1940d 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -589,7 +589,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Паказаць больш дэталей мапы Дадзеныя маршрутызацыі Фармат: - Пошук цікавосткаў (POI) + Пошук POI Пошук па адрасе Каардынаты Пошук грамадзкага транспарту @@ -603,7 +603,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Месца пакуль ня вызначанае Змяніць празрыстасць (0 - празрысты, 255 - непразрысты) Перапыніць cьцягваньне файла? - Дзякуй за карыстаньне OsmAnd. Каб карыстацца ўсімі магчымасьцямі праграмы, вам патрэбныя некаторыя пазасеціўныя зьвесткі для вашага рэгіёну. Іх можна cьцягнуць праз \'Налады\' → \'Кіраваць файламі мапаў\'. Пасьля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць цікавосткі і грамадзкі транспарт. + Дзякуй за карыстаньне OsmAnd. Каб карыстацца ўсімі магчымасьцямі праграмы, вам патрэбныя некаторыя пазасеціўныя зьвесткі для вашага рэгіёну. Іх можна cьцягнуць праз \'Налады\' → \'Кіраваць файламі мапаў\'. Пасьля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць POI і грамадзкі транспарт. Базавая мапа неабходная для карэктнай працы праграмы і аўтаматычна была абраная для cьцягваньня. Нічога не знойдзена. Калі вы не знайшлі свой рэгіён, вы можаце стварыць мапу самастойна (гл. http://osmand.net). Сеціўныя і растравыя мапы @@ -639,7 +639,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві \n\t * Графічны інтэрфейс і ўзаемадзеянне * ↵ \n\t → - Палепшана ў многіх напрамках → → ↵ - Паказваць налады патрэбныя для зваротнай сувязі OSM накшталт збору/зьменаў цікавосткаў, стварэньня/камэнтаваньня хібаў OSM і дасыланьня запісаных файлаў GPX (патрабуе лагін/пароль OSM). + Паказваць налады патрэбныя для зваротнай сувязі OSM накшталт збору/зьменаў POI, стварэньня/камэнтаваньня хібаў OSM і дасыланьня запісаных файлаў GPX (патрабуе лагін/пароль OSM). Вектарныя мапы могуць адлюстроўвацца хутчэй. Падтрымліваецца не ўсімі прыладамі. Прайграць каманды абраным голасам Для распрацоўшчыкаў OsmAnd @@ -924,7 +924,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Выдаліць Перачытаць з карткі SD Сьцягнуць - Зьвесткі цікавосткаў + Зьвесткі POI Адрас Зьвесткi грамадзкага транспарту Дадзеныя мапы @@ -932,7 +932,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Галасавыя зьвесткі (TTS) Галасавыя зьвесткі (запісаныя) Зьвесткі GPX - Зьвесткі цікавосткаў + Зьвесткі POI TTS голас Новы пошук Выберыце памер шрыфта для назваў на мапе @@ -1050,7 +1050,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Транспарт Індэксаваньне адрасоў… Індэксаваньне мапаў… - Індэксаваньне цікавосткаў… + Індэксаваньне POI… Індэксуецца транспарт… Надарылася I/O памылка км @@ -1127,8 +1127,8 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Шукаць транспарт на прыпынку Месца:\n %1$.5f шыр.\n %2$.5f даў. Памылка - Зьмяніць цікавостку - Выдаліць цікавостку + Правіць POI + Выдаліць POI Па компасе У напрамку руху Не варочаць (поўнач уверсе) @@ -1153,7 +1153,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Упадабаныя OSM памылкі (онлайн) Прыпынкі транспарту - Цікавосткі… + POI… Крыніца мапы… Слаі мапы Пошук POI @@ -1230,7 +1230,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Памылка пры загрузцы дадзеных з сервера Для гэтай мясцовасці адсутнічаюць лакальныя дадзеныя аб POI Абнаўленьне POI не даступна для малых узроўняў маштабаваньня - Абнаўленьне POI + Абнавіць POI Абнавіць лакальныя дадзеныя праз Інтэрнэт? Горад: {0} Вуліца: {0}, {1} @@ -1276,7 +1276,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Адкрыцьцё пакета паправак… Закрыцьцё пакета паправак… Захаваньне аб\'екта… - Загрузка POI… + Чытаньне POI… Не атрымалася выканаць аўтарызацыю не ўдалося Канвертацыя мясцовых/ангельскіх назваў… @@ -1355,7 +1355,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Мае мясьціны Пошук Пошук - Абраць цікавостку + Абраць POI Знайсьці яшчэ Шукаць вуліцу Шукаць дом @@ -1386,7 +1386,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Дадаць да ўпадабаных Абнавіць мапу Паведаміць пра памылку на мапе - Стварыць цікавостку + Стварыць POI Так Скасаваць Застасаваць @@ -1415,19 +1415,19 @@ OsmAnd мае адкрыты зыходны код і актыўна разві Зачыніць памылку Памылка была пасьпяхова зачынена Выключная сітуацыя: памылка не была зачынена - Рэдагаваць цікавостку - Стварыць цікавостку + Правіць POI + Стварыць POI POI не знойдзена або не зьяўляецца кропкай Выдаліць {0} (дадаць каментар)? - Выдаліць цікавостку + Выдаліць POI Выдаліць - Цікавостка выдаленая + POI выдаленая дадаць зьмяніць Дзеяньне {0} пасьпяхова завершана. Нечаканая памылка пры выкананьні дзеяньня {0}. Адбылася памылка ўводу/вываду пры выкананьні дзеяньня {0}. - Адбылася памылка пры загрузцы інфармацыі аб POI + Адбылася памылка пры чытаньні інфармацыі пра POI Назва Гадзіны працы Каментар From a90d01e459babbce21822098a2c73c26303d281f Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 13:28:52 +0100 Subject: [PATCH 354/372] Translated using Weblate (Belarusian (latin)) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-be-rBY/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml index 29c7123cc8..74c5d2b473 100644 --- a/OsmAnd/res/values-be-rBY/strings.xml +++ b/OsmAnd/res/values-be-rBY/strings.xml @@ -46,7 +46,7 @@ Ukliučyć ekran Ukliučać ekran prystasavańnia pry nablіžeńnі da pavarotu Nіkolі - Vybrać na mapie + Vybrać na mapie… Paźbiahać darohі… "Źmieny ŭ 1.9: * Abnoŭlienyja stylі mapy z pakazam pakryćcia daroh, transpartnym slojem і piešachodnymі sіmvalamі * Pošuk POI ŭzdoŭž maršrutu * Paznačeńnie darohі jak nieprachodnaj * Liahčej spampoŭvać і abnaŭliać mapy * Atrymańnie vіzuaĺnaha і hukavaha apaviaščeńnia pry nablіžeńnі da punktu maršrutu * Pakaz maršrutu і іnfarmacyі pra pavaroty * Padtrymka palos dlia pavarotu * Padtrymka Android Wear * Šmat źmienaŭ іnterfiejsu * Asobny zum dlia tekstu na mapie * Spiecyjaĺnyja aŭdyjoapaviaščeńnі ŭ vypadku, kalі vy znachodzіciesia pa-za maršrutam * Funkcyja aŭtaryzacyі OsMo * Vypraŭliena niesumiaščaĺnaść viersіj OsMo " Čyhunačnyja maršruty @@ -390,10 +390,10 @@ Vylіčyć maršrut OsmAnd dlia pieršaha і apošniaha ŭčastka maršrutu Cі chočacie vy vykarystoŭvać adliustravany ślied dlia navіhacyі? Dadać punktam pryznačeńnia - Vybrać GPX … + Vybrać GPX… Vybrać miesca pryznačeńnia - Vybrać na mapie … - Upadabanyja .… + Vybrać na mapie… + Upadabanyja.… Nastrojkі maršruta Іnfarmacyja pra maršrut Addavać pieravahu aŭtamahіstraliam From c16ef54cf0eafcf49e632c3d9f013ff0792d9960 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Thu, 8 Jan 2015 12:54:49 +0100 Subject: [PATCH 355/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 80694b6220..4a1fa221f5 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1813,7 +1813,7 @@ Rutes de troleibús Rutes de bus Rutes de tramvia i tren - Selecciona en el mapa + Selecciona en el mapa… Evita carreteres… Amaga Activa la pantalla From e96a2be835fe2d574d73315e5ce97561c60b2b8e Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Thu, 8 Jan 2015 14:26:52 +0100 Subject: [PATCH 356/372] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 9bb09ebb6b..a3f2f088ee 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1820,7 +1820,7 @@ 分享計程車路線 無軌電車路線 公車路線 - 在地圖上選取 + 在地圖上選取… 避開的道路… 有軌電車和火車路線 隱藏 From 0ebc50c2691305e774affa4dc4e2349891ecfa5b Mon Sep 17 00:00:00 2001 From: Viktar Palstsiuk Date: Thu, 8 Jan 2015 12:31:55 +0100 Subject: [PATCH 357/372] Translated using Weblate (Russian) Currently translated at 97.7% (597 of 611 strings) --- OsmAnd/res/values-ru/phrases.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index 039588af41..856093b89d 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -554,20 +554,20 @@ Якорная стоянка Якорный причал Бакен - - + Кардинальный бакен + Латеральный бакен Бакен безопасности Бакен специального назначения Причал - + Здание Мост - + Кардинальный буй Знак изолированной опасности - - + Буй (изолированная опасность) + Латеральный буй Специальный буй - + Дневной маяк Отметка расстояния Сухой док @@ -641,10 +641,11 @@ Аквариум Съезд - + Башня Мачта Животное (аттракцион) Горка Летние санки Док + Американские горки From 95364cb9e7c34a6369425df050a9c88dfc5d4993 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 8 Jan 2015 18:36:03 +0100 Subject: [PATCH 358/372] Rules encoding --- .../src/net/osmand/osm/MapRenderingTypes.java | 67 ++++++++++--------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java index 9576f727c2..b546450a72 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java @@ -423,21 +423,14 @@ public class MapRenderingTypes { XmlPullParser parser = PlatformUtil.newXMLPullParser(); int tok; parser.setInput(is, "UTF-8"); - String parentCategory = null; - String poiParentCategory = null; - String poiParentPrefix = null; - String order = null; + MapRulType parentCategory = null; while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) { if (tok == XmlPullParser.START_TAG) { String name = parser.getName(); if (name.equals("category")) { //$NON-NLS-1$ - parentCategory = parser.getAttributeValue("","name"); - poiParentCategory = parser.getAttributeValue("","poi_category"); - poiParentPrefix = parser.getAttributeValue("","poi_prefix"); - order = parser.getAttributeValue("","order"); - parseCategoryFromXml(parser, poiParentCategory, poiParentPrefix); + parentCategory = parseCategoryFromXml(parser); } else if (name.equals("type")) { - parseTypeFromXML(parser, parentCategory, poiParentCategory, poiParentPrefix, order); + parseTypeFromXML(parser, parentCategory); } else if (name.equals("routing_type")) { parseRouteTagFromXML(parser); } @@ -463,11 +456,11 @@ public class MapRenderingTypes { protected void parseRouteTagFromXML(XmlPullParser parser) { } - protected MapRulType parseTypeFromXML(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder) { - return parseBaseRuleType(parser, parentCategory, poiParentCategory, poiParentPrefix, parentOrder, true); + protected MapRulType parseTypeFromXML(XmlPullParser parser, MapRulType parentCategory) { + return parseBaseRuleType(parser, parentCategory, true); } - protected MapRulType parseBaseRuleType(XmlPullParser parser, String parentCategory, String poiParentCategory, String poiParentPrefix, String parentOrder, boolean filterOnlyMap) { + protected MapRulType parseBaseRuleType(XmlPullParser parser, MapRulType parentCategory, boolean filterOnlyMap) { String tag = lc(parser.getAttributeValue("", "tag")); String value = lc(parser.getAttributeValue("", "value")); String additional = parser.getAttributeValue("", "additional"); @@ -501,8 +494,8 @@ public class MapRenderingTypes { String order = parser.getAttributeValue("", "order"); if(!Algorithms.isEmpty(order)) { rtype.order = Integer.parseInt(order); - } else if(!Algorithms.isEmpty(parentOrder)) { - rtype.order = Integer.parseInt(parentOrder); + } else if (parentCategory != null) { + rtype.order = parentCategory.order; } String applyTo = parser.getAttributeValue("", "apply_to"); String applyValue = parser.getAttributeValue("", "apply_value"); @@ -513,15 +506,15 @@ public class MapRenderingTypes { if(!rtype.onlyMap) { rtype = registerRuleType(rtype); } - - rtype.category = parentCategory; - if (poiParentCategory != null && poiParentCategory.length() > 0) { - rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory); - rtype.poiSpecified = true; - } - if (poiParentPrefix != null) { - rtype.poiPrefix = poiParentPrefix; + rtype.category = parentCategory == null ? null : parentCategory.category; + if (parentCategory != null) { + if (parentCategory.poiCategory != null) { + rtype.poiCategory = parentCategory.poiCategory; + rtype.poiSpecified = true; + } + rtype.poiPrefix = parentCategory.poiPrefix; + rtype.poiWithNameOnly = parentCategory.poiWithNameOnly; } String poiCategory = parser.getAttributeValue("", "poi_category"); @@ -533,7 +526,10 @@ public class MapRenderingTypes { rtype.poiCategory = AmenityType.getAndRegisterType(poiCategory); } } - rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name")); + String poiWithName = parser.getAttributeValue("", "poi_with_name"); + if (poiWithName != null) { + rtype.poiWithNameOnly = Boolean.parseBoolean(poiWithName); + } String poiPrefix = parser.getAttributeValue("", "poi_prefix"); if (poiPrefix != null) { rtype.poiPrefix = poiPrefix; @@ -610,19 +606,26 @@ public class MapRenderingTypes { } } - protected void parseCategoryFromXml(XmlPullParser parser, String poiParentCategory, String poiParentPrefix) { - String poi_tag = parser.getAttributeValue("","poi_tag"); - if (poi_tag != null && poiParentCategory.length() > 0) { - MapRulType rtype = new MapRulType(); - rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory); + protected MapRulType parseCategoryFromXml(XmlPullParser parser) { + String poiTag = parser.getAttributeValue("", "poi_tag"); + String poiCategory = parser.getAttributeValue("", "poi_category"); + MapRulType rtype = new MapRulType(); + rtype.category = parser.getAttributeValue("", "name"); + if (!Algorithms.isEmpty(parser.getAttributeValue("", "order"))) { + rtype.order = Integer.parseInt(parser.getAttributeValue("", "order")); + } + if (poiTag != null && poiCategory != null && poiCategory.length() > 0) { + rtype.poiCategory = AmenityType.getAndRegisterType(parser.getAttributeValue("", "poi_category")); rtype.poiSpecified = true; rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation")); rtype.poiWithNameOnly = Boolean.parseBoolean(parser.getAttributeValue("", "poi_with_name")); - rtype.poiPrefix = poiParentPrefix; + rtype.poiPrefix = parser.getAttributeValue("", "poi_prefix"); rtype.onlyPoi = true; - rtype.tagValuePattern = new TagValuePattern(poi_tag, null); - registerRuleType(rtype); + + rtype.tagValuePattern = new TagValuePattern(poiTag, null); + return registerRuleType(rtype); } + return rtype; } protected static String constructRuleKey(String tag, String val) { From 9e12260196e5911fa0982ba53301c2c9977802a7 Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Thu, 8 Jan 2015 18:26:32 +0100 Subject: [PATCH 359/372] Translated using Weblate (Greek) Currently translated at 94.1% (1501 of 1595 strings) --- OsmAnd/res/values-el/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index cda61b8913..890291e5c8 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -1631,7 +1631,7 @@ Ανώνυμος χρήστης Συνδεδεμένος ως %1$s Ποτέ - Επιλογή στον χάρτη + Επιλογή στον χάρτη… Αποφυγή δρόμων… Απόκρυψη Δρομολόγια From 613ca5d0c47f33778723b76d4796635cff738fee Mon Sep 17 00:00:00 2001 From: Aleksei Polkhirev Date: Thu, 8 Jan 2015 18:25:34 +0100 Subject: [PATCH 360/372] Translated using Weblate (Russian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 36dac72ca5..da1d83f59a 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1805,7 +1805,7 @@ Маршруты автобусов Маршруты трамваев и поездов Скрыть - Выбрать на карте + Выбрать на карте… Избегать дороги… Никогда %1$s необходимо это разрешение, чтобы выключить экран для экономии энергии. From 7323b79687d8c635197018d750b8bb8f99b6d118 Mon Sep 17 00:00:00 2001 From: Massimiliano Caniparoli Date: Thu, 8 Jan 2015 22:01:47 +0100 Subject: [PATCH 361/372] Translated using Weblate (Italian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index c243262249..33486a5643 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -2036,7 +2036,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Arancione Atlante strade tedesche Atlante strade americane - Non usare le regole di calcolo del percorso v1.9 + Ignora le regole di calcolo del percorso v1.9 Non usare le regole di calcolo del percorso introdotte nella v1.9 Passaggio a livello Attraversamento pedonale From f6d57feb1d5886b33e8ae5fa5c4db14ec8d46e32 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 8 Jan 2015 22:45:25 +0100 Subject: [PATCH 362/372] recommend app re-start after display language change --- OsmAnd/res/values-de/strings.xml | 2 +- OsmAnd/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 1a8ad7d379..f83c7c9506 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -729,7 +729,7 @@ Konnte geointent nicht verarbeiten: \'%s\' Adresssuche mit Offline-Daten Systemeinstellung - Anzeigesprache wählen + Anzeigesprache wählen (OsmAnd nach Änderungen neu starten) Anzeigesprache Kartenquelle auswählen Die Kartenquelle und die angezeigten Ebenen können in der Kartenansicht über \'Menü\' → \'Karte konfigurieren\' gewählt werden. diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 5e4c48ead0..9756bd09b6 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1600,7 +1600,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Could not parse geo intent \'%s\' Search geo location System - Select display language + Select display language (please restart OsmAnd after changing) Display language incomplete Select a Map Source From c4e316d8bf7405ada3eba82439b905fa1183bf7d Mon Sep 17 00:00:00 2001 From: Federico Date: Thu, 8 Jan 2015 22:02:42 +0100 Subject: [PATCH 363/372] Translated using Weblate (Italian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-it/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 33486a5643..0edd93b05d 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1038,13 +1038,13 @@ \n\t* \'Nella direzione del movimento\' - La mappa sarà sempre allineata alla vostra direzione \n\t* \'Con la bussola\' - La mappa sarà sempre allineata alla lettura della bussola del dispositivo -"Per le mappe vettoriali offline, l\'aspetto della mappa può essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e meno fastidiosi per la guida di notte. +"Per le mappe vettoriali l\'aspetto della mappa può essere cambiato fra diurno (luminoso) e notturno (scuro). I colori notturni sono più sicuri e meno fastidiosi per la guida di notte. \n\nSi può impostare una regola per il cambio giorno/notte in \'Menu\' → \'Configura la mappa\' → \'Mappa giorno/notte\'. \n\nLe opzioni sono: \n\t* \'Alba/Tramonto\': automatico, in base alla posizione del sole (preimpostato) \n\t* \'Giorno\': usa sempre il modo diurno \n\t* \'Notte\': usa sempre il modo notturno -\n\t* \'Sensore di luminosità\': l\'aspetto della mappa è controllato dal sensore di luminosità del dispositivo (solo se presente) " +\n\t* \'Sensore luce\': l\'aspetto della mappa è controllato dal sensore di luminosità del dispositivo (solo se presente) " "La sorgente della mappa e i livelli visualizzati sono cambiati attraverso \'Menu\'->\'Configura la mappa\'. \n\nSotto \'Sorgente mappa…\' puoi scegliere di usare le mappe vettoriali offline precaricate (predefinito, sono necessarie anche per la navigazione offline), le sorgenti di tasselli predefinite -online o caricate in cache offline- (attiva il plugin \'Mappe online\' in \'Impostazioni\' → \'Gestore plugin\' per averle), o mappe create manualmente usando per esempio OsmAndMapCreator sul PC. \n\nOsmAnd supporta anche sorgenti personalizzate. " From 306eae23af76ee975ecfb763b6b552bc3105eaaf Mon Sep 17 00:00:00 2001 From: ace shadow Date: Thu, 8 Jan 2015 19:50:48 +0100 Subject: [PATCH 364/372] Translated using Weblate (Slovak) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-sk/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 5fff92554a..fcc8f7fd29 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1981,7 +1981,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Autobusové linky Rozsvietiť obrazovku Rozsvietiť obrazovku keď sa blíži odbočenie - Vybrať na mape + Vybrať na mape… Vyhnúť sa cestám… Linky električiek a vlakov Skryť From b442252e0c0156376c96e59558e80fa237c0668c Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 8 Jan 2015 22:53:25 +0100 Subject: [PATCH 365/372] Add dependent rendering attribute --- OsmAnd-java/src/net/osmand/render/RenderingRule.java | 7 +++++++ .../src/net/osmand/render/RenderingRulesStorage.java | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRule.java b/OsmAnd-java/src/net/osmand/render/RenderingRule.java index 74657b6f93..a153b6337f 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRule.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRule.java @@ -160,6 +160,13 @@ public class RenderingRule { ifElseChildren.add(rr); } + public void addToBeginIfElseChildren(RenderingRule rr){ + if(ifElseChildren == null){ + ifElseChildren = new ArrayList(); + } + ifElseChildren.add(0, rr); + } + public boolean isGroup() { return isGroup; } diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java b/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java index a25b3c829d..6cca8467bb 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java @@ -107,8 +107,11 @@ public class RenderingRulesStorage { if (renderingAttributes.containsKey(e.getKey())) { RenderingRule root = renderingAttributes.get(e.getKey()); List list = e.getValue().getIfElseChildren(); + e.getValue().addToBeginIfElseChildren(root); for (RenderingRule every : list) { - root.addIfElseChildren(every); + if(every != root) { + root.addIfElseChildren(every); + } } } else { renderingAttributes.put(e.getKey(), e.getValue()); From 2758aa67c86edea3054023f9069bba76a7ada480 Mon Sep 17 00:00:00 2001 From: Nicolas Palix Date: Thu, 8 Jan 2015 22:53:18 +0100 Subject: [PATCH 366/372] Translated using Weblate (French) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index b4186a603f..b0e10f9d19 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -283,7 +283,7 @@ Ne peut interpréter le geo intent:\'%s\' Recherche d\'adresses dans les cartes hors-ligne Système - Sélectionnez la langue pour l\'affichage + Sélectionnez la langue pour l\'affichage (veuillez redémarrer OsmAnd après un changement) Langue de l\'application Sélectionner une source de carte From 2b13ad1be03a09eaa2660c12980b2a1145ec4dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Thu, 8 Jan 2015 22:50:24 +0100 Subject: [PATCH 367/372] Translated using Weblate (Hungarian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-hu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 725bf96773..e0d4a1f38d 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -335,7 +335,7 @@ Nem sikerült értelmezni a geo intent által küldött parancsot:\'%s\' Cím keresése offline térképen Rendszer nyelve - Megjelenített feliratok nyelve + Megjelenítési nyelv kiválasztása (módosítás után indítsa újra az OsmAnd programot) Preferált nyelv Térképforrás kiválasztása From e55a1d7b8f4074fb9ec56507455e9ba9a7339a13 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Fri, 9 Jan 2015 00:10:52 +0100 Subject: [PATCH 368/372] Update rendering types parser --- OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java index b546450a72..354901115f 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java @@ -433,6 +433,8 @@ public class MapRenderingTypes { parseTypeFromXML(parser, parentCategory); } else if (name.equals("routing_type")) { parseRouteTagFromXML(parser); + } else if (name.equals("entity_convert")) { + parseEntityConvertXML(parser); } } } @@ -453,6 +455,10 @@ public class MapRenderingTypes { } } + protected void parseEntityConvertXML(XmlPullParser parser) { + + } + protected void parseRouteTagFromXML(XmlPullParser parser) { } @@ -673,6 +679,10 @@ public class MapRenderingTypes { return value.equals(e.get(tag)); } + @Override + public String toString() { + return "tag="+tag + " val=" +value; + } @Override public int hashCode() { final int prime = 31; From ca59a3b0de41f2236f494aeb79950377520b0eae Mon Sep 17 00:00:00 2001 From: josep constanti Date: Thu, 8 Jan 2015 23:50:18 +0100 Subject: [PATCH 369/372] Translated using Weblate (Catalan) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ca/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 4a1fa221f5..a5ba0bba70 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -631,7 +631,7 @@ Escolliu el mapa de fons Escolliu el mapa superposat Comparteix una ubicació -Selecciona la llengua a mostrar +Seleccioneu la llengua (reinicieu OsmAnd després de modificar-la) L\'OsmAnd suporta diferents (i personalitzables) perfils d\'aplicació per a diferents usos. \n\nPodeu canviar de perfil amb el boto a la cantonada inferior esquerra de la pantalla del mapa(icona de cotxe,bici o vianant), o quan creeu una ruta. From 9ee28514c4ac53bda5a26ee04c9fc9249a752b27 Mon Sep 17 00:00:00 2001 From: Ldm Public Date: Thu, 8 Jan 2015 23:38:31 +0100 Subject: [PATCH 370/372] Translated using Weblate (French) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-fr/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index b0e10f9d19..8f7771a06e 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -283,7 +283,7 @@ Ne peut interpréter le geo intent:\'%s\' Recherche d\'adresses dans les cartes hors-ligne Système - Sélectionnez la langue pour l\'affichage (veuillez redémarrer OsmAnd après un changement) + Sélectionnez la langue d\'affichage (veuillez redémarrer OsmAnd après modification) Langue de l\'application Sélectionner une source de carte From 90da2da16f77b207baef385f35062fbf434a1549 Mon Sep 17 00:00:00 2001 From: Ivan Vantu5z Date: Thu, 8 Jan 2015 23:22:17 +0100 Subject: [PATCH 371/372] Translated using Weblate (Russian) Currently translated at 100.0% (1595 of 1595 strings) --- OsmAnd/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index da1d83f59a..895e7917da 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -397,7 +397,7 @@ Невозможно разобрать запрос: \"%s\" Поиск по адресу в локальных картах Системная - Изменить язык программы + Выбор языка программы (перезапустите OsmAnd после изменения) Локализация Источник карты From 2899b6961be20dc5ffa779f6f4bd862f1a32cc37 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Fri, 9 Jan 2015 00:47:10 +0100 Subject: [PATCH 372/372] Changed interval to 0 --- OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index ad57a7b822..99107511a0 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -58,7 +58,7 @@ public class RoutingHelper { private Thread currentRunningJob; private long lastTimeEvaluatedRoute = 0; - private int evalWaitInterval = 3000; + private int evalWaitInterval = 0; private ApplicationMode mode; private OsmandSettings settings; @@ -144,7 +144,7 @@ public class RoutingHelper { public synchronized void clearCurrentRoute(LatLon newFinalLocation, List newIntermediatePoints) { route = new RouteCalculationResult(""); isDeviatedFromRoute = false; - evalWaitInterval = 3000; + evalWaitInterval = 0; app.getWaypointHelper().setNewRoute(route); app.runInUIThread(new Runnable() { @Override @@ -561,9 +561,13 @@ public class RoutingHelper { // This check is valid for Online/GPX services (offline routing is aware of route direction) wrongMovementDirection = checkWrongMovementDirection(start, routeNodes.get(newCurrentRoute + 1)); // set/reset evalWaitInterval only if new route is in forward direction + if (!wrongMovementDirection) { evalWaitInterval = 3000; } else { + if(evalWaitInterval == 0){ + evalWaitInterval = 3000; + } evalWaitInterval = evalWaitInterval * 3 / 2; evalWaitInterval = Math.min(evalWaitInterval, 120000); }