From a8bc35a29fef4be34aca9540249ef2908e07b542 Mon Sep 17 00:00:00 2001 From: ExMix Date: Thu, 7 Aug 2014 14:51:50 +0300 Subject: [PATCH] move formating into resource file --- android/res/values-ar/strings.xml | 8 +- android/res/values-cs/strings.xml | 8 +- android/res/values-da/strings.xml | 8 +- android/res/values-de/strings.xml | 8 +- android/res/values-es/strings.xml | 8 +- android/res/values-fr/strings.xml | 8 +- android/res/values-hu/strings.xml | 8 +- android/res/values-it/strings.xml | 8 +- android/res/values-ja/strings.xml | 8 +- android/res/values-ko/strings.xml | 8 +- android/res/values-nl/strings.xml | 6 +- android/res/values-pl/strings.xml | 8 +- android/res/values-pt/strings.xml | 8 +- android/res/values-ru/strings.xml | 8 +- android/res/values-th/strings.xml | 8 +- android/res/values-tr/strings.xml | 8 +- android/res/values-uk/strings.xml | 8 +- android/res/values-zh-rTW/strings.xml | 8 +- android/res/values-zh/strings.xml | 8 +- android/res/values/strings.xml | 8 +- iphone/Maps/ar.lproj/Localizable.strings | 8 +- iphone/Maps/cs.lproj/Localizable.strings | 8 +- iphone/Maps/da.lproj/Localizable.strings | 8 +- iphone/Maps/de.lproj/Localizable.strings | 8 +- iphone/Maps/en.lproj/Localizable.strings | 8 +- iphone/Maps/es.lproj/Localizable.strings | 8 +- iphone/Maps/fr.lproj/Localizable.strings | 8 +- iphone/Maps/hu.lproj/Localizable.strings | 8 +- iphone/Maps/it.lproj/Localizable.strings | 8 +- iphone/Maps/ja.lproj/Localizable.strings | 8 +- iphone/Maps/ko.lproj/Localizable.strings | 8 +- iphone/Maps/nl.lproj/Localizable.strings | 8 +- iphone/Maps/pl.lproj/Localizable.strings | 8 +- iphone/Maps/pt.lproj/Localizable.strings | 8 +- iphone/Maps/ru.lproj/Localizable.strings | 8 +- iphone/Maps/th.lproj/Localizable.strings | 8 +- iphone/Maps/tr.lproj/Localizable.strings | 8 +- iphone/Maps/uk.lproj/Localizable.strings | 8 +- iphone/Maps/zh-Hans.lproj/Localizable.strings | 8 +- iphone/Maps/zh-Hant.lproj/Localizable.strings | 8 +- map/country_status_display.cpp | 12 +- map/framework.cpp | 8 +- strings.txt | 158 +++++++++--------- 43 files changed, 246 insertions(+), 250 deletions(-) diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index 8ae04d1fc4..4c0ff9b759 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -96,13 +96,13 @@ تكبير الى الدولة - ^قد تم إضافته الى صف الانتظار لعملية التنزيل + ^\nقد تم إضافته الى صف الانتظار لعملية التنزيل - جاري التنزيل ^^% + جاري التنزيل\n^\n^% - تنزيل^ + تنزيل\n^ - فشلت عملية تنزيل^ + فشلت عملية تنزيل\n^ محاولة مرة أخرى حول MAPS.ME diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 58e1871812..23e78c9d7d 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -93,13 +93,13 @@ Zobrazit na mapě - ^přidáno do fronty stahování + ^\npřidáno do fronty stahování - Stahování^^% + Stahování\n^\n^% - Stáhnout^ + Stáhnout\n^ - Stahování^selhalo + Stahování\n^\nselhalo Zkusit znovu O aplikaci MAPS.ME diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index c07ec6e613..3ecf89cfca 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -94,13 +94,13 @@ Zoom til landet - ^er tilføjet til download-køen + ^\ner tilføjet til download-køen - Downloader^^% + Downloader\n^\n^% - Download^ + Download\n^ - Download^mislykket + Download\n^\nmislykket Prøv igen Om MAPS.ME diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 11244838df..0f6c96899e 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -93,13 +93,13 @@ Das Land auf der Karte anzeigen - ^wird zur Download-Warteschleife hinzugefügt + ^\nwird zur Download-Warteschleife hinzugefügt - Wird heruntergeladen^^% + Wird heruntergeladen\n^\n^% - Herunterladen^ + Herunterladen\n^ - Download^fehlgeschlagen + Download\n^\nfehlgeschlagen Nochmals versuchen Über MAPS.ME diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 0bd87e3154..809bbed2f7 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -89,13 +89,13 @@ Ampliar la vista del país - ^añadido a la cola de descarga + ^\nañadido a la cola de descarga - Descargando^^% + Descargando\n^\n^% - Descargar^ + Descargar\n^ - Error durante la descarga^ + Error durante la descarga\n^ Intentarla otra vez Sobre MAPS.ME diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 322cd65db6..8a8eac9043 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -97,13 +97,13 @@ Zoomer sur le pays - ^ajouté à la file d\'attente de téléchargement + ^\najouté à la file d\'attente de téléchargement - Téléchargement en cours^^% + Téléchargement en cours\n^\n^% - Télécharger^ + Télécharger\n^ - Échec du téléchargement^ + Échec du téléchargement\n^ Réessayer À propos de MAPS.ME diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 72e559060f..571b752053 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -93,13 +93,13 @@ Nagyítson az országra - ^-t hozzáadtuk a letöltési sorhoz + ^\n-t hozzáadtuk a letöltési sorhoz - ^^% letöltése folyamatban + ^\n^%\nletöltése folyamatban - Letöltés^ + Letöltés\n^ - ^ letöltése sikertelen + ^\nletöltése sikertelen Újrapróbálkozás A MAPS.ME programról diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index 9af44e3157..b42e735b21 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -91,13 +91,13 @@ Zoom sul paese - ^ aggiunto alla coda di download + ^\naggiunto alla coda di download - Sto scaricando^^% + Sto scaricando\n^\n^% - Scarica^ + Scarica\n^ - Lo scaricamento^è fallito + Lo scaricamento\n^\nè fallito Riprova Informazioni su MAPS.ME diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 3a9cbc7366..c4f0c5a246 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -91,13 +91,13 @@ 特定の地域へズーム - ^をダウンロードキューに追加しました + ^\nをダウンロードキューに追加しました - ^^%をダウンロード中 + ^\n^%\nをダウンロード中 - ^をダウンロード + ^\nをダウンロード - ^のダウンロードに失敗しました + ^\nのダウンロードに失敗しました 再実行 MAPS.MEについて diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 15c1f6ada5..e97f74f897 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -88,13 +88,13 @@ 국가로 확대하여 주세요 - ^는 다운로드 대기열에추가됩니다 + ^\n는 다운로드 대기열에추가됩니다 - 다운로드 중^^% + 다운로드 중\n^\n^% - 다운로드^ + 다운로드\n^ - 다운로드에 실패하였습니다^ + 다운로드에 실패하였습니다\n^ 다시 시도 소개 diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 842f7de198..d43a4f8426 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -89,11 +89,11 @@ Zoom in richting het land - ^is toegevoegd aan de download wachtrij + ^\nis toegevoegd aan de download wachtrij - aan het downloaden^^% + aan het downloaden\n^\n^% - Downloaden^is niet gelukt + Downloaden\n^\nis niet gelukt Probeer opnieuw Over MAPS.ME diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 5868e0ce8a..7b526afb1d 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -93,13 +93,13 @@ Przybliż na kraj - ^dodano do kolejki pobierania + ^\ndodano do kolejki pobierania - Pobieranie^^% + Pobieranie\n^\n^% - Pobierz^ + Pobierz\n^ - Pobieranie^nie powiodło się + Pobieranie\n^\nnie powiodło się Spróbuj ponownie O aplikacji MAPS.ME diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 1e189d6585..add0347977 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -91,13 +91,13 @@ Zoom no país - ^é adicionado à fila de descargas + ^\né adicionado à fila de descargas - A descarregar^^% + A descarregar\n^\n^% - Descarga^ + Descarga\n^ - A descarga^falhou + A descarga\n^\nfalhou Tente de novo Sobre o MAPS.ME diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 8f5080225f..6e30145a84 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -97,13 +97,13 @@ Показать страну на карте - ^добавлено в очередь загрузки + ^\nдобавлено в очередь загрузки - Загружается^^% + Загружается\n^\n^% - Загрузить^ + Загрузить\n^ - Ошибка загрузки^ + Ошибка загрузки\n^ Попробуйте еще раз О программе diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index aa00ca5532..67bda4b10c 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -96,13 +96,13 @@ ซูมเข้าไปยังประเทศ - มีการเพิ่ม^ ไปยังลำดับการดาวน์โหลดแล้ว + มีการเพิ่ม ^\nไปยังลำดับการดาวน์โหลดแล้ว - กำลังดาวน์โหลด^^% + กำลังดาวน์โหลด\n^\n^% - ดาวน์โหลด^ + ดาวน์โหลด\n^ - การดาวน์โหลด ^ล้มเหลว + การดาวน์โหลด\n^\nล้มเหลว ลองอีกครั้ง เกี่ยวกับ MAPS.ME diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 38da6dfe50..c4950ca436 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -96,13 +96,13 @@ Ülkeyi yakınlaştır - ^indirme kuyruğuna eklendi + ^\nindirme kuyruğuna eklendi - ^^%indiriliyor + ^\n^%\nindiriliyor - ^indir + ^\nindir - ^indirme işlemi başarısız oldu + ^\nindirme işlemi başarısız oldu Tekrar Deneyin MAPS.ME Hakkında diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 189744a262..d873e74d5b 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -97,13 +97,13 @@ Показати країну на карті - ^добавлено в чергу завантаження + ^\nдобавлено в чергу завантаження - Завантажується^^% + Завантажується\n^\n^% - Завантажити^ + Завантажити\n^ - Помилка завантаження^ + Помилка завантаження\n^ Спробуйте ще раз Про програму diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index af08e2c270..7828d6a241 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -94,13 +94,13 @@ 放大到全國檢視 - ^已加入到下載佇列中 + ^\n已加入到下載佇列中 - 下載中^^% + 下載中\n^\n^% - 下載^ + 下載\n^ - 下載^失敗 + 下載\n^\n失敗 再試一次 MAPS.ME 專業版 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index cc48b874ac..91f195621b 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -92,13 +92,13 @@ 放大至该国 - ^添加至下载序列 + ^\n添加至下载序列 - 下载^^%中 + 下载 ^\n^%\n中 - 下载^ + 下载\n^ - 下载^失败了 + 下载\n^\n失败了 重试 关于 MAPS.ME diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 53d363cd9d..37148313e4 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -100,13 +100,13 @@ Zoom to the country - ^is added to the downloading queue. + ^\nis added to the downloading queue. - Downloading^^% + Downloading\n^\n^% - Download^ + Download\n^ - Downloading^has failed + Downloading\n^\nhas failed Try Again MAPS.ME diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings index 432986b3c1..e1677b28c1 100644 --- a/iphone/Maps/ar.lproj/Localizable.strings +++ b/iphone/Maps/ar.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "تكبير الى الدولة"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^قد تم إضافته الى صف الانتظار لعملية التنزيل"; +"country_status_added_to_queue" = "^\nقد تم إضافته الى صف الانتظار لعملية التنزيل"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "جاري التنزيل ^^%"; +"country_status_downloading" = "جاري التنزيل\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "تنزيل^"; +"country_status_download" = "تنزيل\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "فشلت عملية تنزيل^"; +"country_status_download_failed" = "فشلت عملية تنزيل\n^"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "محاولة مرة أخرى"; diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings index bbcc6f84ce..5f26892224 100644 --- a/iphone/Maps/cs.lproj/Localizable.strings +++ b/iphone/Maps/cs.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Zobrazit na mapě"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^přidáno do fronty stahování"; +"country_status_added_to_queue" = "^\npřidáno do fronty stahování"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Stahování^^%"; +"country_status_downloading" = "Stahování\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Stáhnout^"; +"country_status_download" = "Stáhnout\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Stahování^selhalo"; +"country_status_download_failed" = "Stahování\n^\nselhalo"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Zkusit znovu"; diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings index 488907b757..20c79fe95c 100644 --- a/iphone/Maps/da.lproj/Localizable.strings +++ b/iphone/Maps/da.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Zoom til landet"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^er tilføjet til download-køen"; +"country_status_added_to_queue" = "^\ner tilføjet til download-køen"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Downloader^^%"; +"country_status_downloading" = "Downloader\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Download^"; +"country_status_download" = "Download\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Download^mislykket"; +"country_status_download_failed" = "Download\n^\nmislykket"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Prøv igen"; diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings index 5734741a4d..5e9e04efae 100644 --- a/iphone/Maps/de.lproj/Localizable.strings +++ b/iphone/Maps/de.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Das Land auf der Karte anzeigen"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^wird zur Download-Warteschleife hinzugefügt"; +"country_status_added_to_queue" = "^\nwird zur Download-Warteschleife hinzugefügt"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Wird heruntergeladen^^%"; +"country_status_downloading" = "Wird heruntergeladen\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Herunterladen^"; +"country_status_download" = "Herunterladen\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Download^fehlgeschlagen"; +"country_status_download_failed" = "Download\n^\nfehlgeschlagen"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Nochmals versuchen"; diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index cc9efd113b..a2bec9122c 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Zoom to the country"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^is added to the downloading queue."; +"country_status_added_to_queue" = "^\nis added to the downloading queue."; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Downloading^^%"; +"country_status_downloading" = "Downloading\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Download^"; +"country_status_download" = "Download\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Downloading^has failed"; +"country_status_download_failed" = "Downloading\n^\nhas failed"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Try Again"; diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings index 67e82a2da1..c6f8936553 100644 --- a/iphone/Maps/es.lproj/Localizable.strings +++ b/iphone/Maps/es.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Ampliar la vista del país"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^añadido a la cola de descarga"; +"country_status_added_to_queue" = "^\nañadido a la cola de descarga"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Descargando^^%"; +"country_status_downloading" = "Descargando\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Descargar^"; +"country_status_download" = "Descargar\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Error durante la descarga^"; +"country_status_download_failed" = "Error durante la descarga\n^"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Intentarla otra vez"; diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings index a8c03237b8..1215dcfe38 100644 --- a/iphone/Maps/fr.lproj/Localizable.strings +++ b/iphone/Maps/fr.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Zoomer sur le pays"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^ajouté à la file d'attente de téléchargement"; +"country_status_added_to_queue" = "^\najouté à la file d'attente de téléchargement"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Téléchargement en cours^^%"; +"country_status_downloading" = "Téléchargement en cours\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Télécharger^"; +"country_status_download" = "Télécharger\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Échec du téléchargement^"; +"country_status_download_failed" = "Échec du téléchargement\n^"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Réessayer"; diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings index cb745be3dd..a9439b8039 100644 --- a/iphone/Maps/hu.lproj/Localizable.strings +++ b/iphone/Maps/hu.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Nagyítson az országra"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^-t hozzáadtuk a letöltési sorhoz"; +"country_status_added_to_queue" = "^\n-t hozzáadtuk a letöltési sorhoz"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "^^% letöltése folyamatban"; +"country_status_downloading" = "^\n^%\nletöltése folyamatban"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Letöltés^"; +"country_status_download" = "Letöltés\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "^ letöltése sikertelen"; +"country_status_download_failed" = "^\nletöltése sikertelen"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Újrapróbálkozás"; diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings index 05a6060427..8b45df93d4 100644 --- a/iphone/Maps/it.lproj/Localizable.strings +++ b/iphone/Maps/it.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Zoom sul paese"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^ aggiunto alla coda di download"; +"country_status_added_to_queue" = "^\naggiunto alla coda di download"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Sto scaricando^^%"; +"country_status_downloading" = "Sto scaricando\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Scarica^"; +"country_status_download" = "Scarica\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Lo scaricamento^è fallito"; +"country_status_download_failed" = "Lo scaricamento\n^\nè fallito"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Riprova"; diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings index 04b5a017df..7db3a7741b 100644 --- a/iphone/Maps/ja.lproj/Localizable.strings +++ b/iphone/Maps/ja.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "特定の地域へズーム"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^をダウンロードキューに追加しました"; +"country_status_added_to_queue" = "^\nをダウンロードキューに追加しました"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "^^%をダウンロード中"; +"country_status_downloading" = "^\n^%\nをダウンロード中"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "^をダウンロード"; +"country_status_download" = "^\nをダウンロード"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "^のダウンロードに失敗しました"; +"country_status_download_failed" = "^\nのダウンロードに失敗しました"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "再実行"; diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings index 28c4956745..a19728b95f 100644 --- a/iphone/Maps/ko.lproj/Localizable.strings +++ b/iphone/Maps/ko.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "국가로 확대하여 주세요"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^는 다운로드 대기열에추가됩니다"; +"country_status_added_to_queue" = "^\n는 다운로드 대기열에추가됩니다"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "다운로드 중^^%"; +"country_status_downloading" = "다운로드 중\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "다운로드^"; +"country_status_download" = "다운로드\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "다운로드에 실패하였습니다^"; +"country_status_download_failed" = "다운로드에 실패하였습니다\n^"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "다시 시도"; diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings index 558ce03633..4408fd188f 100644 --- a/iphone/Maps/nl.lproj/Localizable.strings +++ b/iphone/Maps/nl.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Zoom in richting het land"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^is toegevoegd aan de download wachtrij"; +"country_status_added_to_queue" = "^\nis toegevoegd aan de download wachtrij"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "aan het downloaden^^%"; +"country_status_downloading" = "aan het downloaden\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Download^"; +"country_status_download" = "Download\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Downloaden^is niet gelukt"; +"country_status_download_failed" = "Downloaden\n^\nis niet gelukt"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Probeer opnieuw"; diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings index c21506c3c3..3aa68c891e 100644 --- a/iphone/Maps/pl.lproj/Localizable.strings +++ b/iphone/Maps/pl.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Przybliż na kraj"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^dodano do kolejki pobierania"; +"country_status_added_to_queue" = "^\ndodano do kolejki pobierania"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Pobieranie^^%"; +"country_status_downloading" = "Pobieranie\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Pobierz^"; +"country_status_download" = "Pobierz\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Pobieranie^nie powiodło się"; +"country_status_download_failed" = "Pobieranie\n^\nnie powiodło się"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Spróbuj ponownie"; diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings index d288658939..d053818e9e 100644 --- a/iphone/Maps/pt.lproj/Localizable.strings +++ b/iphone/Maps/pt.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Zoom no país"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^é adicionado à fila de descargas"; +"country_status_added_to_queue" = "^\né adicionado à fila de descargas"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "A descarregar^^%"; +"country_status_downloading" = "A descarregar\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Descarga^"; +"country_status_download" = "Descarga\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "A descarga^falhou"; +"country_status_download_failed" = "A descarga\n^\nfalhou"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Tente de novo"; diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings index 2e3868efae..be9dba4883 100644 --- a/iphone/Maps/ru.lproj/Localizable.strings +++ b/iphone/Maps/ru.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Показать страну на карте"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^добавлено в очередь загрузки"; +"country_status_added_to_queue" = "^\nдобавлено в очередь загрузки"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Загружается^^%"; +"country_status_downloading" = "Загружается\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Загрузить^"; +"country_status_download" = "Загрузить\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Ошибка загрузки^"; +"country_status_download_failed" = "Ошибка загрузки\n^"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Попробуйте еще раз"; diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings index 06593014e5..05d65e6940 100644 --- a/iphone/Maps/th.lproj/Localizable.strings +++ b/iphone/Maps/th.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "ซูมเข้าไปยังประเทศ"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "มีการเพิ่ม^ ไปยังลำดับการดาวน์โหลดแล้ว"; +"country_status_added_to_queue" = "มีการเพิ่ม ^\nไปยังลำดับการดาวน์โหลดแล้ว"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "กำลังดาวน์โหลด^^%"; +"country_status_downloading" = "กำลังดาวน์โหลด\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "ดาวน์โหลด^"; +"country_status_download" = "ดาวน์โหลด\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "การดาวน์โหลด ^ล้มเหลว"; +"country_status_download_failed" = "การดาวน์โหลด\n^\nล้มเหลว"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "ลองอีกครั้ง"; diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings index d2861239c5..070d4bd3c7 100644 --- a/iphone/Maps/tr.lproj/Localizable.strings +++ b/iphone/Maps/tr.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Ülkeyi yakınlaştır"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^indirme kuyruğuna eklendi"; +"country_status_added_to_queue" = "^\nindirme kuyruğuna eklendi"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "^^%indiriliyor"; +"country_status_downloading" = "^\n^%\nindiriliyor"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "^indir"; +"country_status_download" = "^\nindir"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "^indirme işlemi başarısız oldu"; +"country_status_download_failed" = "^\nindirme işlemi başarısız oldu"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Tekrar Deneyin"; diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings index bc6f03f673..498c76f2c1 100644 --- a/iphone/Maps/uk.lproj/Localizable.strings +++ b/iphone/Maps/uk.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "Показати країну на карті"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^добавлено в чергу завантаження"; +"country_status_added_to_queue" = "^\nдобавлено в чергу завантаження"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "Завантажується^^%"; +"country_status_downloading" = "Завантажується\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "Завантажити^"; +"country_status_download" = "Завантажити\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "Помилка завантаження^"; +"country_status_download_failed" = "Помилка завантаження\n^"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "Спробуйте ще раз"; diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings index cbb149a858..14b5d694a5 100644 --- a/iphone/Maps/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "放大至该国"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^添加至下载序列"; +"country_status_added_to_queue" = "^\n添加至下载序列"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "下载^^%中"; +"country_status_downloading" = "下载 ^\n^%\n中"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "下载^"; +"country_status_download" = "下载\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "下载^失败了"; +"country_status_download_failed" = "下载\n^\n失败了"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "重试"; diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings index 9749522c10..b4b9fad69b 100644 --- a/iphone/Maps/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings @@ -151,16 +151,16 @@ "zoom_to_country" = "放大到全國檢視"; /* Message to display at the center of the screen when the country is added to the downloading queue */ -"country_status_added_to_queue" = "^已加入到下載佇列中"; +"country_status_added_to_queue" = "^\n已加入到下載佇列中"; /* Message to display at the center of the screen when the country is downloading */ -"country_status_downloading" = "下載中^^%"; +"country_status_downloading" = "下載中\n^\n^%"; /* Button text for the button at the center of the screen when the country is not downloaded */ -"country_status_download" = "下載^"; +"country_status_download" = "下載\n^"; /* Message to display at the center of the screen when the country download has failed */ -"country_status_download_failed" = "下載^失敗"; +"country_status_download_failed" = "下載\n^\n失敗"; /* Button text for the button under the country_status_download_failed message */ "try_again" = "再試一次"; diff --git a/map/country_status_display.cpp b/map/country_status_display.cpp index 06254d4845..5f08e7b5d1 100644 --- a/map/country_status_display.cpp +++ b/map/country_status_display.cpp @@ -76,16 +76,14 @@ void CountryStatusDisplay::cache() { case storage::EInQueue: { - string const s = dn + "\n"; - SetStatusMessage("country_status_added_to_queue", &s); + SetStatusMessage("country_status_added_to_queue", &dn); break; } case storage::EDownloading: { int const percent = m_countryProgress.first * 100 / m_countryProgress.second; - string const s = "\n" + dn + "\n"; - SetStatusMessage("country_status_downloading", &s, &percent); + SetStatusMessage("country_status_downloading", &dn, &percent); break; } @@ -96,7 +94,7 @@ void CountryStatusDisplay::cache() { m_downloadButton->setIsVisible(true); string const msg = m_controller->GetStringsBundle()->GetString("country_status_download"); - m_downloadButton->setText(strings::Format(msg, "\n" + dn)); + m_downloadButton->setText(strings::Format(msg, dn)); } break; @@ -104,9 +102,7 @@ void CountryStatusDisplay::cache() { m_downloadButton->setIsVisible(true); m_downloadButton->setText(m_controller->GetStringsBundle()->GetString("try_again")); - - string const s = "\n" + dn + "\n"; - SetStatusMessage("country_status_download_failed", &s); + SetStatusMessage("country_status_download_failed", &dn); setPivot(pivot()); break; diff --git a/map/framework.cpp b/map/framework.cpp index 3903b45167..ddb76bb01e 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -210,10 +210,10 @@ Framework::Framework() m_ParsedMapApi.SetController(&m_bmManager.UserMarksGetController(UserMarkContainer::API_MARK)); // Init strings bundle. - m_stringsBundle.SetDefaultString("country_status_added_to_queue", "^is added to the downloading queue"); - m_stringsBundle.SetDefaultString("country_status_downloading", "Downloading^^%"); - m_stringsBundle.SetDefaultString("country_status_download", "Download^"); - m_stringsBundle.SetDefaultString("country_status_download_failed", "Downloading^has failed"); + m_stringsBundle.SetDefaultString("country_status_added_to_queue", "^\nis added to the downloading queue"); + m_stringsBundle.SetDefaultString("country_status_downloading", "Downloading\n^\n^%"); + m_stringsBundle.SetDefaultString("country_status_download", "Download\n^"); + m_stringsBundle.SetDefaultString("country_status_download_failed", "Downloading\n^\nhas failed"); m_stringsBundle.SetDefaultString("try_again", "Try Again"); m_stringsBundle.SetDefaultString("not_enough_free_space_on_sdcard", "Not enough space for downloading"); diff --git a/strings.txt b/strings.txt index 938db7dcef..61a01a0682 100644 --- a/strings.txt +++ b/strings.txt @@ -1066,95 +1066,95 @@ tr = Ülkeyi yakınlaştır [country_status_added_to_queue] - en = ^is added to the downloading queue. + en = ^\nis added to the downloading queue. comment = Message to display at the center of the screen when the country is added to the downloading queue - cs = ^přidáno do fronty stahování - de = ^wird zur Download-Warteschleife hinzugefügt - es = ^añadido a la cola de descarga - fr = ^ajouté à la file d'attente de téléchargement - it = ^ aggiunto alla coda di download - ja = ^をダウンロードキューに追加しました - ko = ^는 다운로드 대기열에추가됩니다 - nl = ^is toegevoegd aan de download wachtrij - ru = ^добавлено в очередь загрузки - uk = ^добавлено в чергу завантаження - zh-Hant = ^已加入到下載佇列中 - pl = ^dodano do kolejki pobierania - pt = ^é adicionado à fila de descargas - hu = ^-t hozzáadtuk a letöltési sorhoz - th = มีการเพิ่ม^ ไปยังลำดับการดาวน์โหลดแล้ว - zh-Hans = ^添加至下载序列 - ar = ^قد تم إضافته الى صف الانتظار لعملية التنزيل - da = ^er tilføjet til download-køen - tr = ^indirme kuyruğuna eklendi + cs = ^\npřidáno do fronty stahování + de = ^\nwird zur Download-Warteschleife hinzugefügt + es = ^\nañadido a la cola de descarga + fr = ^\najouté à la file d'attente de téléchargement + it = ^\naggiunto alla coda di download + ja = ^\nをダウンロードキューに追加しました + ko = ^\n는 다운로드 대기열에추가됩니다 + nl = ^\nis toegevoegd aan de download wachtrij + ru = ^\nдобавлено в очередь загрузки + uk = ^\nдобавлено в чергу завантаження + zh-Hant = ^\n已加入到下載佇列中 + pl = ^\ndodano do kolejki pobierania + pt = ^\né adicionado à fila de descargas + hu = ^\n-t hozzáadtuk a letöltési sorhoz + th = มีการเพิ่ม ^\nไปยังลำดับการดาวน์โหลดแล้ว + zh-Hans = ^\n添加至下载序列 + ar = ^\nقد تم إضافته الى صف الانتظار لعملية التنزيل + da = ^\ner tilføjet til download-køen + tr = ^\nindirme kuyruğuna eklendi [country_status_downloading] - en = Downloading^^% + en = Downloading\n^\n^% comment = Message to display at the center of the screen when the country is downloading - cs = Stahování^^% - de = Wird heruntergeladen^^% - es = Descargando^^% - fr = Téléchargement en cours^^% - it = Sto scaricando^^% - ja = ^^%をダウンロード中 - ko = 다운로드 중^^% - nl = aan het downloaden^^% - ru = Загружается^^% - uk = Завантажується^^% - zh-Hant = 下載中^^% - pl = Pobieranie^^% - pt = A descarregar^^% - hu = ^^% letöltése folyamatban - th = กำลังดาวน์โหลด^^% - zh-Hans = 下载^^%中 - ar = جاري التنزيل ^^% - da = Downloader^^% - tr = ^^%indiriliyor + cs = Stahování\n^\n^% + de = Wird heruntergeladen\n^\n^% + es = Descargando\n^\n^% + fr = Téléchargement en cours\n^\n^% + it = Sto scaricando\n^\n^% + ja = ^\n^%\nをダウンロード中 + ko = 다운로드 중\n^\n^% + nl = aan het downloaden\n^\n^% + ru = Загружается\n^\n^% + uk = Завантажується\n^\n^% + zh-Hant = 下載中\n^\n^% + pl = Pobieranie\n^\n^% + pt = A descarregar\n^\n^% + hu = ^\n^%\nletöltése folyamatban + th = กำลังดาวน์โหลด\n^\n^% + zh-Hans = 下载 ^\n^%\n中 + ar = جاري التنزيل\n^\n^% + da = Downloader\n^\n^% + tr = ^\n^%\nindiriliyor [country_status_download] - en = Download^ + en = Download\n^ comment = Button text for the button at the center of the screen when the country is not downloaded - cs = Stáhnout^ - de = Herunterladen^ - es = Descargar^ - fr = Télécharger^ - it = Scarica^ - ja = ^をダウンロード - ko = 다운로드^ - ru = Загрузить^ - uk = Завантажити^ - zh-Hant = 下載^ - pl = Pobierz^ - pt = Descarga^ - hu = Letöltés^ - th = ดาวน์โหลด^ - zh-Hans = 下载^ - ar = تنزيل^ - da = Download^ - tr = ^indir + cs = Stáhnout\n^ + de = Herunterladen\n^ + es = Descargar\n^ + fr = Télécharger\n^ + it = Scarica\n^ + ja = ^\nをダウンロード + ko = 다운로드\n^ + ru = Загрузить\n^ + uk = Завантажити\n^ + zh-Hant = 下載\n^ + pl = Pobierz\n^ + pt = Descarga\n^ + hu = Letöltés\n^ + th = ดาวน์โหลด\n^ + zh-Hans = 下载\n^ + ar = تنزيل\n^ + da = Download\n^ + tr = ^\nindir [country_status_download_failed] - en = Downloading^has failed + en = Downloading\n^\nhas failed comment = Message to display at the center of the screen when the country download has failed - cs = Stahování^selhalo - de = Download^fehlgeschlagen - es = Error durante la descarga^ - fr = Échec du téléchargement^ - it = Lo scaricamento^è fallito - ja = ^のダウンロードに失敗しました - ko = 다운로드에 실패하였습니다^ - nl = Downloaden^is niet gelukt - ru = Ошибка загрузки^ - uk = Помилка завантаження^ - zh-Hant = 下載^失敗 - pl = Pobieranie^nie powiodło się - pt = A descarga^falhou - hu = ^ letöltése sikertelen - th = การดาวน์โหลด ^ล้มเหลว - zh-Hans = 下载^失败了 - ar = فشلت عملية تنزيل^ - da = Download^mislykket - tr = ^indirme işlemi başarısız oldu + cs = Stahování\n^\nselhalo + de = Download\n^\nfehlgeschlagen + es = Error durante la descarga\n^ + fr = Échec du téléchargement\n^ + it = Lo scaricamento\n^\nè fallito + ja = ^\nのダウンロードに失敗しました + ko = 다운로드에 실패하였습니다\n^ + nl = Downloaden\n^\nis niet gelukt + ru = Ошибка загрузки\n^ + uk = Помилка завантаження\n^ + zh-Hant = 下載\n^\n失敗 + pl = Pobieranie\n^\nnie powiodło się + pt = A descarga\n^\nfalhou + hu = ^\nletöltése sikertelen + th = การดาวน์โหลด\n^\nล้มเหลว + zh-Hans = 下载\n^\n失败了 + ar = فشلت عملية تنزيل\n^ + da = Download\n^\nmislykket + tr = ^\nindirme işlemi başarısız oldu [try_again] en = Try Again