pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

using ^ instead of % as a placeholder for format parameter.

Browse source
This commit is contained in:
rachytski 2012-07-06 15:00:37 -07:00 • committed by Alex Zolotarev
parent 502b730829
commit 6cc193db45
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/res/values-ru/strings.xml
View file

@ -108,13 +108,13 @@
<!-- Search Suggestion -->
<string name="tourism">достопримечательность</string>
<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
<string name="country_status_added_to_queue">%добавлено в очередь\nзагрузки.</string>
<string name="country_status_added_to_queue">^добавлено в очередь\nзагрузки.</string>
<!-- Message to display at the center of the screen when the country is downloading -->
<string name="country_status_downloading">Загружается%1$(%2$\\%3$)</string>
<string name="country_status_downloading">Загружается^(^%)</string>
<!-- Button text for the button at the center of the screen when the country is not downloaded -->
<string name="country_status_download">Загрузить%</string>
<string name="country_status_download">Загрузить^</string>
<!-- Message to display at the center of the screen when the country download has failed -->
<string name="country_status_download_failed">Ошибка загрузки%.</string>
<string name="country_status_download_failed">Ошибка загрузки^.</string>
<!-- Button text for the button under the country_status_download_failed message -->
<string name="try_again">Попробуйте еще раз</string>
<string name="about_menu_title">О программе</string>

8
android/res/values/strings.xml
View file

@ -108,13 +108,13 @@
<!-- Search Suggestion -->
<string name="tourism">sights</string>
<!-- Message to display at the center of the screen when the country is added to the downloading queue -->
<string name="country_status_added_to_queue">%is added to the\ndownloading queue.</string>
<string name="country_status_added_to_queue">^is added to the\ndownloading queue.</string>
<!-- Message to display at the center of the screen when the country is downloading -->
<string name="country_status_downloading">Downloading%1$(%2$\\%3$)</string>
<string name="country_status_downloading">Downloading^(^%)</string>
<!-- Button text for the button at the center of the screen when the country is not downloaded -->
<string name="country_status_download">Download%</string>
<string name="country_status_download">Download^</string>
<!-- Message to display at the center of the screen when the country download has failed -->
<string name="country_status_download_failed">Downloading%\nhas failed</string>
<string name="country_status_download_failed">Downloading^\nhas failed</string>
<!-- Button text for the button under the country_status_download_failed message -->
<string name="try_again">Try Again</string>
<string name="app_name">Maps With Me</string>

2
base/string_format.cpp
View file

@ -14,7 +14,7 @@ namespace strings
while (true)
{
offs = res.find("%", offs);
offs = res.find("^", offs);
if (offs == string::npos)
break;
else

16
strings.txt
View file

@ -458,21 +458,21 @@
ja = 観光
ko = 관광
[country_status_added_to_queue]
en = %is added to the\ndownloading queue.
en = ^is added to the\ndownloading queue.
comment = Message to display at the center of the screen when the country is added to the downloading queue
ru = %добавлено в очередь\nзагрузки.
ru = ^добавлено в очередь\nзагрузки.
[country_status_downloading]
en = Downloading%(%\\%)
en = Downloading^(^%)
comment = Message to display at the center of the screen when the country is downloading
ru = Загружается%(%\\%)
ru = Загружается^(^%)
[country_status_download]
en = Download%
en = Download^
comment = Button text for the button at the center of the screen when the country is not downloaded
ru = Загрузить%
ru = Загрузить^
[country_status_download_failed]
en = Downloading%\nhas failed
en = Downloading^\nhas failed
comment = Message to display at the center of the screen when the country download has failed
ru = Ошибка загрузки%.
ru = Ошибка загрузки^.
[try_again]
en = Try Again
comment = Button text for the button under the country_status_download_failed message