diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index e4c941e613..7fd1d3b460 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1957,7 +1957,7 @@ Дадаць новую катэгорыю Катэгорыя з пазначанай назвай ужо існуе. Калі ласка, падайце іншую назву. Вы ўпэўненыя, што хочаце сьцягнуць мапу аўтадарог, нават калі ў вас ёсць поўная мапа? - %1$.1f з %2$.1f Мб + %1$.1f з %2$.1f Мб %.1f Мб Абнавіць усе (%1$s МБ) Выкарыстана бясплатных загрузак diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml index 9de19ecb41..b0555fbb3a 100644 --- a/OsmAnd/res/values-ca/strings.xml +++ b/OsmAnd/res/values-ca/strings.xml @@ -1771,7 +1771,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu Nom de categoria Afegeix una nova categoria N\'esteu segur de baixar el mapa amb només carreteres, quan ja teniu el mapa normal (complet)? - %1$.1f de %2$.1f MB + %1$.1f de %2$.1f MB %.1f MB Actualitzeu tot (%1$s MB) Baixades gratuïtes realitzades diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index e8abf69dc5..ef20d3a251 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1767,7 +1767,7 @@ Později Plná verze Stahování - %1$.1f z %2$.1f MB + %1$.1f z %2$.1f MB %.1f MB Aktualizovat vše (%1$s MB) Použito volných stáhnutí diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 27b970e599..520b99b871 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -2011,7 +2011,7 @@ Kategorinavn Tilføj ny kategori Hent kort kun med veje, selv om et komplet standardkort allerede er hentet? - %1$.1f af %2$.1f MB + %1$.1f af %2$.1f MB %.1f MB Opdater alle (%1$s MB) Indstil hvormange gratis filhentninger der er brugt diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 5c1e13d38e..9033ff2d03 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -2176,7 +2176,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an Bitte das SRTM-Plugin aktivieren Vollversion Soll wirklich die reine Straßenkarte heruntergeladen werden, obwohl bereits die vollständige Standardkarte vorhanden ist? - %1$.1f von %2$.1f MB + %1$.1f von %2$.1f MB Alles aktualisieren (%1$s MB) Verbrauchte freie Downloads Name des Landes eingeben diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 38552df29e..d9e1d2c49f 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -1900,7 +1900,7 @@ Nombre de categoría Añadir nueva categoría ¿Desea descargar el mapa vial, aunque ya tenga el mapa estándar (completo)? - %1$.1f de %2$.1f MB + %1$.1f de %2$.1f MB %.1f MB Actualizar todo (%1$s MB) Descargas gratis usadas diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml index bcb844e88d..c8e67173c4 100644 --- a/OsmAnd/res/values-es/strings.xml +++ b/OsmAnd/res/values-es/strings.xml @@ -1898,7 +1898,7 @@ Nombre de categoría Añadir nueva categoría ¿Desea descargar el mapa de sólo carreteras, aunque ya tenga el mapa estándar (completo)? - %1$.1f de %2$.1f MB + %1$.1f de %2$.1f MB %.1f MB Actualizar todo (%1$s MB) Descargas gratis usadas diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index 748e5f7c29..f38386a3d4 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -2028,7 +2028,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et Ajouter une catégorie Cette catégorie existe déjà. Merci d\'indiquer un autre nom. Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ? - %1$.1f de %2$.1f MB + %1$.1f de %2$.1f MB %.1f MB Tout mettre à jour (%1$s MB) Téléchargements gratuits effectués diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml index 7f2cf6cb09..bf0375d558 100644 --- a/OsmAnd/res/values-gl/strings.xml +++ b/OsmAnd/res/values-gl/strings.xml @@ -1905,7 +1905,7 @@ Versión completa Descargas Confirma que desexa descargar un mapa de estradas, aínda que ten o mapa completo? - %1$.1f de %2$.1f MB + %1$.1f de %2$.1f MB %.1f MB Actualizar todo (%1$s MB) Descargas gratuítas empregadas diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 966eb9d353..06d163356c 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1944,7 +1944,7 @@ Kategórianév Új kategória létrehozása Biztosan letöltesz csak utakat tartalmazó térképet, annak ellenére, hogy már van teljes térképed? - %1$.1f / %2$.1f MB + %1$.1f / %2$.1f MB %.1f MB Összes frissítése (%1$s MB) Elhasznált ingyenes letöltés diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index d4b45b8bcb..49fb44141c 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1989,7 +1989,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz Nome della categoria Aggiungi una nuova categoria Sei sicuro di volere scaricare mappe solo stradali anche se disponi di mappe complete? - %1$.1f di %2$.1f MB + %1$.1f di %2$.1f MB %.1f MB Aggiorna tutto (%1$s MB) Download gratuiti utilizzati diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml index 2ee837afaa..db3e953204 100644 --- a/OsmAnd/res/values-ja/strings.xml +++ b/OsmAnd/res/values-ja/strings.xml @@ -2030,7 +2030,7 @@ POIの更新は利用できません フルバージョンを入手 ダウンロード 標準の(完全な)マップがありますが、道路のみのマップをダウンロードしてよろしいですか? - %1$.1f / %2$.1f MB + %1$.1f / %2$.1f MB %.1f MB 全て更新(%1$s MB) 使用済み無料ダウンロード枠 diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml index 1d350a5950..27de60094d 100644 --- a/OsmAnd/res/values-ko/strings.xml +++ b/OsmAnd/res/values-ko/strings.xml @@ -2213,5 +2213,5 @@ 다운로드 모든 지도를 가지고 있더러도 지도를 다운로드 하시겠습니까? %.1f MB -%2$.1f MB 에서 %1$.1f +%2$.1f MB 에서 %1$.1f \ No newline at end of file diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index f382bf4db6..3d83d3a31c 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -1934,7 +1934,7 @@ Pridėti naują kategoriją Visa versija Atsisiuntimai - %1$.1f iš %2$.1f MB + %1$.1f iš %2$.1f MB %.1f MB Atnaujinti viską (%1$s MB) Kontūro linijos išjungtos diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index f86372f9df..50700cf4c6 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -1401,7 +1401,7 @@ Kart over %1$s har blitt lastet ned. Gå tilbake til kartet for å begynne å bruke det. Gå til kartet Nedlastinger - %1$.1f av %2$.1f MB + %1$.1f av %2$.1f MB %.1f MB Oppdater alle (%1$s MB) Gratis nedlastinger brukt diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index f615e69df8..946d4b4217 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -2162,7 +2162,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Later Downloads U heeft de volledige kaart al. Wilt u echt de kaart met alleen wegen downloaden? - %1$.1f van %2$.1f MB + %1$.1f van %2$.1f MB %.1f MB Alles updaten (%1$s MB) Gebruikte gratis downloads diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index b574472b44..9b5744d7b3 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -2055,7 +2055,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant Uaktualnij wszystko (%1$s MB) Wykorzystano darmowe pobrania Proszę wybrać położenie zapisywania plików map. -%1$.1f z %2$.1f MB +%1$.1f z %2$.1f MB Kod QR Proszę wybrać kraj Mapa %1$s została pobrana. Proszę powrócić do mapy, aby rozpocząć jej używanie. diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index c0595eebdc..1b79a97ce7 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1792,7 +1792,7 @@ Показывать баннер бесплатной версии Даже если у вас купленная версия вы также можете видеть баннер для бесплатной версии Вы уверены, что хотите скачать карту автодорог, даже если у вас есть полная карта? - %1$.1f из %2$.1f Мб + %1$.1f из %2$.1f Мб %.1f МБ Обновить все (%1$s МБ) Использовано бесплатных загрузок diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index 0d61e94f5c..794895a52b 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -1931,7 +1931,7 @@ Nùmene de sa categoria Annanghe una categoria noa Seguru ses de bòlere iscarrigare sa mapa cun petzi sas istradas, fintzas si tenes giai cussa cumprida? - %1$.1f dae %2$.1f MB + %1$.1f dae %2$.1f MB %.1f MB Agiorna totu (%1$s MB) Iscarrigamentos gratùitos impreados diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 59a58b0a5a..3acb432983 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1843,7 +1843,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda, Názov kategórie Pridať novú kategóriu Naozaj chcete stiahnuť mapu obsahujúcu iba cesty, keď už máte štandardnú (plnú) mapu? - %1$.1f z %2$.1f MB + %1$.1f z %2$.1f MB %.1f MB Aktualizovať všetko (%1$s MB) Počet použitých voľných stiahnutí diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index fe54c6dd7f..57f174c1a1 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1935,7 +1935,7 @@ Ime kategorije Dodaj kategorijo Ali ste prepričani, da želite prejeti zemljevid le s podatki cest, čeprav je nameščen že polni zemljevid? - %1$.1f od %2$.1f MB + %1$.1f od %2$.1f MB %.1f MB Posodobi vse (%1$s MB) Omejitev brezplačnih prejemov je dosežena. diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 37b8854785..717f840980 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1920,7 +1920,7 @@ Lägg till en ny kategori %.1f MB Är du säker på att du vill hämta kartan med enbart vägar trots att du redan har den fullständiga kartan? - %1$.1f av %2$.1f MB + %1$.1f av %2$.1f MB Uppdatera alla (%1$s MB) Gratis nedladdningar hämtade Du kan ange hur många gratis nedladdningar som du har gjort diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 84aa313eae..a5c90e043e 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1917,7 +1917,7 @@ 類別名稱 增加新的類別 您確定要下載只有道路的地圖,即使您已經擁有標準(完整的)地圖? - %1$.1f 從 %2$.1f MB + %1$.1f 從 %2$.1f MB %.1f MB 全部更新 (%1$s MB) 免費下載使用 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 4ad325cf61..4190885ed1 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -1693,7 +1693,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A A previous OsmAnd version is installed. All offline data will be supported by the new application. But Favorite points should be exported in the old application and later imported by the new one. Build {0} successfully installed ({1}). Downloading build… - Do you want to install OsmAnd - {0} from {1} {2} MB ? + Do you want to install OsmAnd - {0} of {1} {2} MB ? Retrieving the list of OsmAnd builds failed Loading OsmAnd builds… Select an OsmAnd build to install @@ -2063,7 +2063,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Full version Downloads Are you sure you want to download the roads-only map, even though you already have the standard (full) map? - %1$.1f from %2$.1f MB + %1$.1f of %2$.1f MB %.1f MB Update all (%1$s MB) Free downloads used diff --git a/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java b/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java index 7ce7581d5c..cc380bd8b6 100644 --- a/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java +++ b/OsmAnd/src/net/osmand/plus/download/ui/ItemViewHolder.java @@ -189,7 +189,7 @@ public class ItemViewHolder { double mb = indexItem.getArchiveSizeMB(); String v ; if (progress != -1) { - v = context.getString(R.string.value_downloaded_from_max, mb * progress / 100, mb); + v = context.getString(R.string.value_downloaded_of_max, mb * progress / 100, mb); } else { v = context.getString(R.string.file_size_in_mb, mb); } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java index 4a6fd87cc1..f9cd3d320e 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapDataMenuController.java @@ -260,7 +260,7 @@ public class MapDataMenuController extends MenuController { double mb = indexItem.getArchiveSizeMB(); String v ; if (titleProgressController.progress != -1) { - v = getMapActivity().getString(R.string.value_downloaded_from_max, mb * titleProgressController.progress / 100, mb); + v = getMapActivity().getString(R.string.value_downloaded_of_max, mb * titleProgressController.progress / 100, mb); } else { v = getMapActivity().getString(R.string.file_size_in_mb, mb); }