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

Merge pull request #4469 from therearesomewhocallmetim/android_duplicate_key_fix

Browse source 
Android duplicate key fix
This commit is contained in:
alexzatsepin 2016-10-10 15:33:49 +03:00 • committed by GitHub
commit f9f2c21a46
32 changed files with 64 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -988,8 +988,8 @@
<string name="booking_filters_price_category">Ценовая категория</string>
<string name="booking_filters_no_results">Поиск не дал результатов</string>
<string name="booking_filters_nores_message">Попробуйте задать более общий запрос, уменьшить масштаб карты или сбросить фильтр.</string>
<string name="booking_filters_expand_area">Уменьшить масштаб карты</string>
<string name="booking_filters_reset">Сбросить фильтр</string>
<string name="booking_filters_expand_area_button">Уменьшить масштаб карты</string>
<string name="booking_filters_reset_button">Сбросить фильтр</string>
<string name="booking_list">Список</string>
<string name="booking_based_on_reviews">По %d отзывам об отеле</string>
<string name="booking_show_more">Показать еще</string>

1
android/res/values-zh-rTW/strings.xml
View file

@ -809,6 +809,7 @@
<string name="download_over_mobile_message">用某些方案或漫遊的話這可能相當昂貴。</string>
<string name="error_enter_correct_house_number">輸入正確的門牌號碼</string>
<string name="editor_storey_number">樓號（最大 %d）</string>
<!-- Error message in Editor when a user tries to set the number of floors for a building higher than 25 -->
<string name="error_enter_correct_storey_number">編輯最多 25 層的建築</string>
<string name="editor_zip_code">郵遞區號</string>
<string name="error_enter_correct_zip_code">輸入正確的郵遞區號</string>

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

@ -992,8 +992,8 @@
<string name="booking_filters_price_category">Price Category</string>
<string name="booking_filters_no_results">No Results Found</string>
<string name="booking_filters_nores_message">Try a more general search term, zoom out or reset the filter.</string>
<string name="booking_filters_expand_area">Zoom out</string>
<string name="booking_filters_reset">Reset Filter</string>
<string name="booking_filters_expand_area_button">Zoom out</string>
<string name="booking_filters_reset_button">Reset Filter</string>
<string name="booking_list">List</string>
<string name="booking_based_on_reviews">Based on %d hotel reviews</string>
<string name="booking_show_more">Show more</string>

4
iphone/Maps/ar.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/cs.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/da.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/de.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/en-GB.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/en.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/es.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/fi.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/fr.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/hu.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/id.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/it.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/ja.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/ko.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/nb.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/nl.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/pl.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/pt.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/ro.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/ru.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Попробуйте задать более общий запрос, уменьшить масштаб карты или сбросить фильтр.";
"booking_filters_expand_area" = "Уменьшить масштаб карты";
"booking_filters_expand_area_button" = "Уменьшить масштаб карты";
"booking_filters_reset" = "Сбросить фильтр";
"booking_filters_reset_button" = "Сбросить фильтр";
"booking_list" = "Список";

4
iphone/Maps/sk.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/sv.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/th.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/tr.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/uk.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/vi.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/zh-Hans.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

4
iphone/Maps/zh-Hant.lproj/Localizable.strings
View file

@ -1668,9 +1668,9 @@
"booking_filters_nores_message" = "Try a more general search term, zoom out or reset the filter.";
"booking_filters_expand_area" = "Zoom out";
"booking_filters_expand_area_button" = "Zoom out";
"booking_filters_reset" = "Reset Filter";
"booking_filters_reset_button" = "Reset Filter";
"booking_list" = "List";

6
strings.txt
View file

@ -19921,7 +19921,7 @@
ru = Фильтр
[booking_filters_reset]
en = Reset
en = Reset
ru = Сбросить
[booking_filters_rating]
@ -19956,11 +19956,11 @@
en = Try a more general search term, zoom out or reset the filter.
ru = Попробуйте задать более общий запрос, уменьшить масштаб карты или сбросить фильтр.
[booking_filters_expand_area]
[booking_filters_expand_area_button]
en = Zoom out
ru = Уменьшить масштаб карты
[booking_filters_reset]
[booking_filters_reset_button]
en = Reset Filter
ru = Сбросить фильтр