Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
GaidamakUA 2015-08-26 20:44:22 +03:00
commit 759e169586
13 changed files with 51 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-da/phrases.xml
View file

@ -1068,4 +1068,6 @@
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Parfumeri</string> <string name="poi_perfumery">Parfumeri</string>
</resources> <string name="poi_building">Bygning</string>
</resources>

2
OsmAnd/res/values-de/phrases.xml
View file

@ -98,7 +98,7 @@
<string name="poi_car_sharing">Carsharing Station</string> <string name="poi_car_sharing">Carsharing Station</string>
<string name="poi_car">Autohändler</string> <string name="poi_car">Autohändler</string>
<string name="poi_car_wash">Autowaschanlage</string> <string name="poi_car_wash">Autowaschanlage</string>
<string name="poi_caravan_site">Campingplatz</string> <string name="poi_caravan_site">Wohnmobil-Stellplätze</string>
<string name="poi_craft_carpenter">Tischler</string> <string name="poi_craft_carpenter">Tischler</string>
<string name="poi_craft_carpet_layer">Teppichleger</string> <string name="poi_craft_carpet_layer">Teppichleger</string>
<string name="poi_carpet">Teppichgeschäft</string> <string name="poi_carpet">Teppichgeschäft</string>

5
OsmAnd/res/values-el/strings.xml
View file

@ -1825,4 +1825,7 @@
<string name="location_on_map">Τοποθεσία:\n Γ. Πλ %1$s\n Γ. Μηκ %2$s</string> <string name="location_on_map">Τοποθεσία:\n Γ. Πλ %1$s\n Γ. Μηκ %2$s</string>
<string name="rendering_value__name">Προκαθορισμένο</string> <string name="rendering_value__name">Προκαθορισμένο</string>
<string name="print_route">Εκτύπωση διαδρομής</string> <string name="print_route">Εκτύπωση διαδρομής</string>
</resources> <string name="osmand_parking_overdue">εκπρόθεσμο</string>
<string name="simulate_your_location">Προσομοίωση της θέση σας</string>
<string name="rendering_value_highContrastRoads_name">Δρόμοι με υψηλή αντίθεση</string>
</resources>

10
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -842,7 +842,7 @@
<string name="poi_stile">Escalera de paso</string> <string name="poi_stile">Escalera de paso</string>
<string name="poi_height_restrictor">Limitador de altura</string> <string name="poi_height_restrictor">Limitador de altura</string>
<string name="poi_horse_stile">Portilla equina</string> <string name="poi_horse_stile">Portilla equina</string>
<string name="poi_kissing_gate">Portilla giratoria</string> <string name="poi_kissing_gate">Portilla en V</string>
<string name="poi_sally_port">Poterna</string> <string name="poi_sally_port">Poterna</string>
<string name="poi_swing_gate">Barrera giratoria</string> <string name="poi_swing_gate">Barrera giratoria</string>
<string name="poi_turnstile">Molinete</string> <string name="poi_turnstile">Molinete</string>
@ -922,7 +922,7 @@
<string name="poi_enforcement_toll">Control de peaje</string> <string name="poi_enforcement_toll">Control de peaje</string>
<string name="poi_country">País</string> <string name="poi_country">País</string>
<string name="poi_fee_yes">Costo</string> <string name="poi_fee_yes">Tarifado</string>
<string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string> <string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string>
<string name="poi_abandoned_poi">Objeto abandonado</string> <string name="poi_abandoned_poi">Objeto abandonado</string>
@ -945,7 +945,7 @@
<string name="poi_access_delivery">Acceso para entregas</string> <string name="poi_access_delivery">Acceso para entregas</string>
<string name="poi_monitoring_station">Estación de monitoreo</string> <string name="poi_monitoring_station">Estación de monitoreo</string>
<string name="poi_capital">Capital</string> <string name="poi_capital">Capital</string>
<string name="poi_fee_no">Sin costo</string> <string name="poi_fee_no">Sin cargo</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
@ -1050,4 +1050,6 @@
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Perfumería</string> <string name="poi_perfumery">Perfumería</string>
</resources> <string name="poi_building">Edificio</string>
</resources>

8
OsmAnd/res/values-es/phrases.xml
View file

@ -925,7 +925,7 @@
<string name="poi_enforcement_access">Control de acceso</string> <string name="poi_enforcement_access">Control de acceso</string>
<string name="poi_country">País</string> <string name="poi_country">País</string>
<string name="poi_fee_yes">Costo</string> <string name="poi_fee_yes">Tarifado</string>
<string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string> <string name="poi_kent_carriage_gap">Bolardos para carros a caballo</string>
<string name="poi_abandoned_poi">Objeto abandonado</string> <string name="poi_abandoned_poi">Objeto abandonado</string>
@ -948,7 +948,7 @@
<string name="poi_access_delivery">Acceso para entregas</string> <string name="poi_access_delivery">Acceso para entregas</string>
<string name="poi_monitoring_station">Estación de monitoreo</string> <string name="poi_monitoring_station">Estación de monitoreo</string>
<string name="poi_capital">Capital</string> <string name="poi_capital">Capital</string>
<string name="poi_fee_no">Sin costo</string> <string name="poi_fee_no">Sin cargo</string>
<string name="poi_email">Email</string> <string name="poi_email">Email</string>
<string name="poi_fax">Fax</string> <string name="poi_fax">Fax</string>
@ -1053,4 +1053,6 @@
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">Perfumería</string> <string name="poi_perfumery">Perfumería</string>
</resources> <string name="poi_building">Edificio</string>
</resources>

4
OsmAnd/res/values-fr/phrases.xml
View file

@ -1030,4 +1030,6 @@
<string name="poi_perfumery">Parfumerie</string> <string name="poi_perfumery">Parfumerie</string>
<string name="poi_recycling_low_energy_bulbs">Ampoules basse consommation</string> <string name="poi_recycling_low_energy_bulbs">Ampoules basse consommation</string>
</resources> <string name="poi_building">Bâtiment</string>
</resources>

17
OsmAnd/res/values-ja/strings.xml
View file

@ -179,7 +179,7 @@ OsmAnd バージョンがインストールされています。全てのオフ
<string name="build_installed">ビルド {0} はインストール <string name="build_installed">ビルド {0} はインストール
されました ({1})。</string> されました ({1})。</string>
<string name="downloading_build">指定ビルドをダウンロード中…</string> <string name="downloading_build">指定ビルドをダウンロード中…</string>
<string name="install_selected_build">本当にOsmAndをインストールしますか？ - {0} から {1} {2} MB</string> <string name="install_selected_build">"- {0} ビルド {1} {2} MB\n上記のOsmAndをインストールしますか？ "</string>
<string name="loading_builds_failed">OsmAndビルドのリスト参照に失敗</string> <string name="loading_builds_failed">OsmAndビルドのリスト参照に失敗</string>
<string name="loading_builds">OsmAnd ビルドをロード中…</string> <string name="loading_builds">OsmAnd ビルドをロード中…</string>
<string name="select_build_to_install">インストールするOsmAndのビルドをひとつ <string name="select_build_to_install">インストールするOsmAndのビルドをひとつ
@ -482,7 +482,7 @@ POIの更新は利用できません</string>
<string name="save_track_interval_descr">ナビゲーション中の経路の記録間隔を選択</string> <string name="save_track_interval_descr">ナビゲーション中の経路の記録間隔を選択</string>
<string name="save_track_interval">ナビゲーション中の経路記録間隔</string> <string name="save_track_interval">ナビゲーション中の経路記録間隔</string>
<string name="save_track_to_gpx_descrp">ナビゲーション中の経路はtracksフォルダに保存されます</string> <string name="save_track_to_gpx_descrp">ナビゲーション中の経路はtracksフォルダに保存される</string>
<string name="save_track_to_gpx">ナビゲーション中に経路ログをGPXに記録</string> <string name="save_track_to_gpx">ナビゲーション中に経路ログをGPXに記録</string>
<string name="update_tile">マップを更新</string> <string name="update_tile">マップを更新</string>
<string name="reload_tile">タイルをリロード</string> <string name="reload_tile">タイルをリロード</string>
@ -1812,7 +1812,7 @@ POIの更新は利用できません</string>
<string name="distance">距離</string> <string name="distance">距離</string>
<string name="rendering_attr_publicTransportMode_name">バス、トロリーバス、シャトルバスルート</string> <string name="rendering_attr_publicTransportMode_name">バス、トロリーバス、シャトルバスルート</string>
<string name="save_track_to_gpx_globally">GPXファイルに経路を記録</string> <string name="save_track_to_gpx_globally">GPXファイルに経路を記録</string>
<string name="save_track_to_gpx_globally_descr">GPXファイルへの一般の位置(General position)記録は、マップ画面上のGPXログウィジェットを使用してオンとオフを切り替えることができます</string> <string name="save_track_to_gpx_globally_descr">GPXファイルへの一般の位置(General position)記録は、マップ画面上のGPXログウィジェットを使用してオンとオフを切り替えることが可能</string>
<string name="save_track_interval_globally">記録間隔</string> <string name="save_track_interval_globally">記録間隔</string>
<string name="confirm_every_run">常に尋ねる</string> <string name="confirm_every_run">常に尋ねる</string>
<string name="save_global_track_interval_descr">標準的な経路の記録間隔を選択(マップ上のGPXログウィジェットで有効化)</string> <string name="save_global_track_interval_descr">標準的な経路の記録間隔を選択(マップ上のGPXログウィジェットで有効化)</string>
@ -2097,7 +2097,7 @@ POIの更新は利用できません</string>
<string name="download_wikipedia_files">Wikipediaの追加データ(%1$s MB)をダウンロードしますか？</string> <string name="download_wikipedia_files">Wikipediaの追加データ(%1$s MB)をダウンロードしますか？</string>
<string name="gps_network_not_enabled">位置情報サービス(GPS)がオフになっています。オンにしますか？</string> <string name="gps_network_not_enabled">位置情報サービス(GPS)がオフになっています。オンにしますか？</string>
<string name="disable_recording_once_app_killed">スタンドアロン動作時のログ記録を停止</string> <string name="disable_recording_once_app_killed">スタンドアロン動作時のログ記録を停止</string>
<string name="disable_recording_once_app_killed_descrp">アプリは(タスクリストから)停止された場合、GPX記録を一時停止します。 (OsmAndスリープモード動作表示は、Androidの通知エリアに表示されなくなります。)</string> <string name="disable_recording_once_app_killed_descrp">アプリは(タスクリストから)停止された場合、GPX記録を一時停止する。 (OsmAndスリープモード動作表示は、Androidの通知エリアに表示されなくなる。)</string>
<string name="rendering_value_default13_name">デフォルト (13)</string> <string name="rendering_value_default13_name">デフォルト (13)</string>
<string name="rendering_value_defaultTranslucentCyan_name">デフォルト (半透明シアン)</string> <string name="rendering_value_defaultTranslucentCyan_name">デフォルト (半透明シアン)</string>
<string name="shared_string_import2osmand">OsmAndにインポート</string> <string name="shared_string_import2osmand">OsmAndにインポート</string>
@ -2125,4 +2125,13 @@ POIの更新は利用できません</string>
<string name="successfully_uploaded_pattern">正常にアップロードされました {0}/{1}</string> <string name="successfully_uploaded_pattern">正常にアップロードされました {0}/{1}</string>
<string name="try_again">再試行</string> <string name="try_again">再試行</string>
<string name="error_message_pattern">エラー: {0}</string> <string name="error_message_pattern">エラー: {0}</string>
<string name="plugin_settings">プラグイン</string>
<string name="routing_attr_avoid_shuttle_train_name">カートレインを使用しない</string>
<string name="routing_attr_avoid_shuttle_train_description">カートレインを使用しない</string>
<string name="dahboard_options_dialog_title">ダッシュボードオプション</string>
<string name="shared_string_undo">元に戻す</string>
<string name="shared_string_skip">スキップ</string>
<string name="app_name_osmand">OsmAnd</string>
<string name="offline_maps_and_navigation">Offline Maps\n&amp; Navigation</string>
<string name="commit_poi">POIを申請する</string>
</resources> </resources>

4
OsmAnd/res/values-ko/strings.xml
View file

@ -2334,10 +2334,10 @@
<string name="rate_this_app_long">구글 플레이에 OsmAnd을 평가해 주세요</string> <string name="rate_this_app_long">구글 플레이에 OsmAnd을 평가해 주세요</string>
<string name="user_hates_app_get_feedback">우리에게 이유를 가르쳐 쥬세요.</string> <string name="user_hates_app_get_feedback">우리에게 이유를 가르쳐 쥬세요.</string>
<string name="user_hates_app_get_feedback_long">우리가 이 응용 프로그램에서 무엇을 변경 해야 하는 지 알려 주세요.</string> <string name="user_hates_app_get_feedback_long">우리가 이 응용 프로그램에서 무엇을 변경 해야 하는 지 알려 주세요.</string>
<string name="failed_to_upload">업로드 하지 못했습니다.</string> <string name="failed_to_upload">업로드 하지 못했습니다</string>
<string name="delete_change">변경을 삭제합니다</string> <string name="delete_change">변경을 삭제합니다</string>
<string name="successfully_uploaded_pattern">성공적으로 업로드 {0}/{1}</string> <string name="successfully_uploaded_pattern">성공적으로 업로드 {0}/{1}</string>
<string name="try_again">다시 시도하십시오.</string> <string name="try_again">다시 시도하십시오</string>
<string name="error_message_pattern">오류: {0}</string> <string name="error_message_pattern">오류: {0}</string>
<string name="dahboard_options_dialog_title">대시보드 옵션</string> <string name="dahboard_options_dialog_title">대시보드 옵션</string>
<string name="shared_string_card_was_hidden">카드는 숨겨졌습니다</string> <string name="shared_string_card_was_hidden">카드는 숨겨졌습니다</string>

1
OsmAnd/res/values-ru/phrases.xml
View file

@ -757,7 +757,6 @@
<string name="poi_training">Учебный центр</string> <string name="poi_training">Учебный центр</string>
<string name="poi_quarter">Квартал</string> <string name="poi_quarter">Квартал</string>
<string name="poi_field_hockey">Хоккейная площадка</string> <string name="poi_field_hockey">Хоккейная площадка</string>
<string name="poi_team_handball">Командный гандбол</string>
<string name="poi_rest_area">Зона отдыха</string> <string name="poi_rest_area">Зона отдыха</string>
<string name="poi_reservoir">Резервуар</string> <string name="poi_reservoir">Резервуар</string>

2
OsmAnd/res/values-sv/strings.xml
View file

@ -1970,4 +1970,6 @@
<string name="app_name_osmand">OsmAnd</string> <string name="app_name_osmand">OsmAnd</string>
<string name="routing_attr_avoid_shuttle_train_name">Undvik pendeltåg</string> <string name="routing_attr_avoid_shuttle_train_name">Undvik pendeltåg</string>
<string name="routing_attr_avoid_shuttle_train_description">Undvik pendeltåg</string> <string name="routing_attr_avoid_shuttle_train_description">Undvik pendeltåg</string>
<string name="plugin_settings">Insticksprogram</string>
<string name="traffic_warning_hazard">Varning</string>
</resources> </resources>

4
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -1049,4 +1049,6 @@
<string name="poi_google_plus">Google+</string> <string name="poi_google_plus">Google+</string>
<string name="poi_perfumery">香水商店</string> <string name="poi_perfumery">香水商店</string>
</resources> <string name="poi_building">建築物</string>
</resources>

14
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -770,7 +770,7 @@
<string name="search_history_city">縣市：{0}</string> <string name="search_history_city">縣市：{0}</string>
<string name="search_history_street">道路：{0}, {1}</string> <string name="search_history_street">道路：{0}, {1}</string>
<string name="search_history_int_streets">交叉路口：{0} x {1} 在{2}</string> <string name="search_history_int_streets">交叉路口：{0} x {1} 在{2}</string>
<string name="search_history_building">建物：{0}, {1}, {2}</string> <string name="search_history_building">建築物：{0}, {1}, {2}</string>
<string name="favorite">我的最愛</string> <string name="favorite">我的最愛</string>
<string name="uploading_data">上傳資料中…</string> <string name="uploading_data">上傳資料中…</string>
<string name="uploading">上傳中…</string> <string name="uploading">上傳中…</string>
@ -809,7 +809,7 @@
<string name="auth_failed">授權失敗</string> <string name="auth_failed">授權失敗</string>
<string name="failed_op">失敗</string> <string name="failed_op">失敗</string>
<string name="converting_names">本地/英文名稱轉換中…</string> <string name="converting_names">本地/英文名稱轉換中…</string>
<string name="loading_streets_buildings">正在載入道路/建物…</string> <string name="loading_streets_buildings">正在載入道路/建築物…</string>
<string name="loading_postcodes">正在載入郵遞區號…</string> <string name="loading_postcodes">正在載入郵遞區號…</string>
<string name="loading_streets">正在載入街道…</string> <string name="loading_streets">正在載入街道…</string>
<string name="loading_cities">正在載入縣市…</string> <string name="loading_cities">正在載入縣市…</string>
@ -855,7 +855,7 @@
<string name="use_english_names">在地圖上使用英文名稱</string> <string name="use_english_names">在地圖上使用英文名稱</string>
<string name="app_settings">應用程式設定</string> <string name="app_settings">應用程式設定</string>
<string name="search_address">地址查詢</string> <string name="search_address">地址查詢</string>
<string name="choose_building">選取建物</string> <string name="choose_building">選取建築物</string>
<string name="choose_street">選擇道路</string> <string name="choose_street">選擇道路</string>
<string name="choose_city">選擇縣市</string> <string name="choose_city">選擇縣市</string>
<string name="ChooseCountry">選擇國家</string> <string name="ChooseCountry">選擇國家</string>
@ -880,7 +880,7 @@
<string name="search_POI_level_btn">查尋更多</string> <string name="search_POI_level_btn">查尋更多</string>
<string name="incremental_search_city">漸進式城市查尋</string> <string name="incremental_search_city">漸進式城市查尋</string>
<string name="incremental_search_street">漸進式查尋街道</string> <string name="incremental_search_street">漸進式查尋街道</string>
<string name="incremental_search_building">漸進式查尋建物</string> <string name="incremental_search_building">漸進式查尋建築物</string>
<string name="choose_available_region">由列表選取區域</string> <string name="choose_available_region">由列表選取區域</string>
<string name="choose_intersected_street">選擇交叉路口</string> <string name="choose_intersected_street">選擇交叉路口</string>
<string name="Closest_Amenities">最近的設施</string> <string name="Closest_Amenities">最近的設施</string>
@ -902,8 +902,8 @@
<string name="search_address_region">地區</string> <string name="search_address_region">地區</string>
<string name="search_address_city">縣市</string> <string name="search_address_city">縣市</string>
<string name="search_address_street">道路</string> <string name="search_address_street">道路</string>
<string name="search_address_building">建物</string> <string name="search_address_building">建築物</string>
<string name="search_address_building_option">建物</string> <string name="search_address_building_option">建築物</string>
<string name="search_address_street_option">交叉路口</string> <string name="search_address_street_option">交叉路口</string>
<string name="search_tabs_location">位置</string> <string name="search_tabs_location">位置</string>
@ -1100,7 +1100,7 @@
<string name="route_descr_current_location">目前位置</string> <string name="route_descr_current_location">目前位置</string>
<string name="no_buildings_found">無建築物符合。</string> <string name="no_buildings_found">未找到建築物。</string>
<string name="search_villages_and_postcodes">查尋更多城鎮/郵遞區號</string> <string name="search_villages_and_postcodes">查尋更多城鎮/郵遞區號</string>
<string name="rendering_attr_showRoadMaps_description">選擇何時顯示僅有道路的地圖：</string> <string name="rendering_attr_showRoadMaps_description">選擇何時顯示僅有道路的地圖：</string>
<string name="rendering_attr_showRoadMaps_name">僅有道路的地圖</string> <string name="rendering_attr_showRoadMaps_name">僅有道路的地圖</string>

3
OsmAnd/res/values/phrases.xml
View file

@ -562,7 +562,6 @@
<string name="poi_surfing">Surfing</string> <string name="poi_surfing">Surfing</string>
<string name="poi_swimming">Swimming</string> <string name="poi_swimming">Swimming</string>
<string name="poi_table_tennis">Table tennis</string> <string name="poi_table_tennis">Table tennis</string>
<string name="poi_team_handball">Team handball</string>
<string name="poi_tennis">Tennis</string> <string name="poi_tennis">Tennis</string>
<string name="poi_toboggan">Toboggan</string> <string name="poi_toboggan">Toboggan</string>
<string name="poi_volleyball">Volleyball</string> <string name="poi_volleyball">Volleyball</string>
@ -1045,4 +1044,6 @@
<string name="poi_animal_shelter_dog_cat">Shelter for dogs and cats</string> <string name="poi_animal_shelter_dog_cat">Shelter for dogs and cats</string>
<string name="poi_animal_shelter_bird">Shelter for birds</string> <string name="poi_animal_shelter_bird">Shelter for birds</string>
<string name="poi_building">Building</string>
</resources> </resources>