Fixed some merge issues.

This commit is contained in:
vng 2014-10-21 20:31:02 +03:00 committed by Alex Zolotarev
parent 3b8f933575
commit b8694fcd88
4 changed files with 3 additions and 4 deletions

View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<resources>
<string name="flurry_app_key">***REMOVED***</string>
<string name="app_name">MAPS.ME Pro</string>
</resources>

View file

@ -100,7 +100,7 @@
<!-- View and button titles for accessibility -->
<string name="zoom_to_country">Zoom to the country</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">^\nis added\nto the downloading queue.</string>
<string name="country_status_added_to_queue">^\nis added to the downloading queue.</string>
<!-- Message to display at the center of the screen when the country is downloading -->
<string name="country_status_downloading">Downloading\n^\n^%</string>
<string name="country_status_download_routing">Download Map + Routing\n^ ^</string>

View file

@ -151,7 +151,7 @@
"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" = "^\nis added\nto 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\n^\n^%";

View file

@ -1156,7 +1156,7 @@
sv = Zooma till landet
[country_status_added_to_queue]
en = ^\nis added\nto 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 = ^\npřidáno do fronty stahování
sk = ^\npridané do zoznamu sťahovania