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

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

Browse source
This commit is contained in:
Victor Shcherb 2014-07-11 17:05:14 +02:00
commit f977b661e9
4 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1507,7 +1507,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
\n\t* Possibilità di eliminare i file SRTM
\n\t* Supporto alle note OSM
</string>
<string name="search_street_in_neighborhood_cities">Cerca la strada nelle città vicine</string>
<string name="search_street_in_neighborhood_cities">Cerca la strada nelle località vicine</string>
<string name="intermediate_items_sort_return">Punti intermedi riordinati in modo da ottimizzare il percorso verso la destinazione.</string>
<string name="intermediate_items_sort_by_distance">Ordina (porta a porta)</string>
<string name="please_select_address">Scegli prima la città o la strada</string>

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

@ -96,7 +96,7 @@
<string name="tip_update_index">更新離線地圖</string>
<string name="tip_update_index_t">"離線地圖的查看與 POI/位址查尋，以及離線導航，有最新的圖資是不可或缺的。OsmAnd 提供地圖檔案管理用以下載那些離線圖資，並且檢查能用的更新。
\n\n下載圖資更新由\'設定\' -&gt; \'管理地圖檔案\' -&gt; \'下載\'。
\n\n經由網路取得區域列表後，點選任意一個進入，做下載或更新檔案。請注意，檔案類型選擇，在畫面上方的附近，選取您想要的類型下載（正常地圖、地形陰影覆疊等）。
\n\n經由網路取得區域列表後，點選任意一個進入，做下載或更新檔案。請注意檔案類型選擇，在畫面上方的附近，選取您想要的類型下載（正常地圖、地形陰影覆疊等）。
\n\n您可以在篩選區域清單中輸入一些文字，或者您可以按選項的\'設定\' -&gt; \'篩選已下載的\'可看見已篩選出在您裝置上的更新資料。
\n\t* 登錄為\'綠色\'，表示裝置與伺服器是相同的
\n\t* 登錄為\'藍色\'，表示伺服器有更新的版本
@ -1890,4 +1890,16 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告
<string name="osmo_not_signed_in">OsMo 登入失敗</string>
<string name="osmo_auth_error_short">授權失敗</string>
<string name="osmo_auth_error">OsMo 授權時遇到錯誤：%1$s。\n這可能是服務臨時當機或是您的註冊已過期。\n您想要繼續跟新的註冊。</string>
<string name="rendering_attr_hideBuildings_name">隱藏建築物</string>
<string name="rendering_attr_hideNonVehicleHighways_name">隱藏非車輛的高速公路</string>
<string name="rendering_attr_hideText_name">隱藏文字</string>
<string name="rendering_attr_hideWoodScrubs_name">隱藏樹木和灌樹叢</string>
<string name="rendering_attr_buildings15zoom_name">在 15 級下縮放建築物</string>
<string name="rendering_attr_moreDetailed_name">更多細節</string>
<string name="rendering_attr_lessDetailed_name">較少細節</string>
<string name="rendering_attr_hideAccess_name">隱藏存取類型</string>
<string name="rendering_attr_showAccess_name">顯示存取類型</string>
<string name="rendering_attr_showSurfaceGrade_name">顯示道路的品質</string>
<string name="rendering_attr_showSurfaces_name">顯示道路表面</string>
<string name="rendering_attr_cycleRoutes_name">顯示腳踏車道</string>
</resources>

14
OsmAnd/res/values/strings.xml
View file

@ -9,7 +9,19 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="osmo_auth_error_short">Authorization failed</string>
<string name="rendering_attr_hideBuildings_name">Hide buildings</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Hide non-vehicle highways</string>
<string name="rendering_attr_hideText_name">Hide text</string>
<string name="rendering_attr_hideWoodScrubs_name">Hide wood and scrubs</string>
<string name="rendering_attr_buildings15zoom_name">Buildings on 15 zoom</string>
<string name="rendering_attr_moreDetailed_name">More detailed</string>
<string name="rendering_attr_lessDetailed_name">Less detailed</string>
<string name="rendering_attr_hideAccess_name">Hide the type of access</string>
<string name="rendering_attr_showAccess_name">Show the type of access</string>
<string name="rendering_attr_showSurfaceGrade_name">Show the quality of roads</string>
<string name="rendering_attr_showSurfaces_name">Show road surfaces</string>
<string name="rendering_attr_cycleRoutes_name">Show cycle routes</string>
<string name="osmo_auth_error_short">Authorization failed</string>
<string name="osmo_auth_error">OsMo authorization error encountered : %1$s.\n
It could be a temporary service down or your registration expired.\n
Do you want to proceed with new registration.</string>

5
OsmAnd/src/net/osmand/plus/render/RendererRegistry.java
View file

@ -36,11 +36,10 @@ public class RendererRegistry {
public RendererRegistry(){
internalRenderers.put(DEFAULT_RENDER, "default.render.xml");
internalRenderers.put("Touring-view_(more-contrast-and-details)", "Touring-view_(more-contrast-and-details)" +".render.xml");
internalRenderers.put("High-contrast-roads", "High-contrast-roads" + ".render.xml");
internalRenderers.put("Winter-and-ski", "Winter-and-ski" + ".render.xml");
internalRenderers.put("Topo-map-assimilation", "Topo-map-assimilation" + ".render.xml");
internalRenderers.put("UniRS", "UniRS" + ".render.xml");
internalRenderers.put("LightRS", "LightRS" + ".render.xml");
internalRenderers.put("High-contrast-roads", "High-contrast-roads" + ".render.xml");
internalRenderers.put("Winter-and-ski", "Winter-and-ski" + ".render.xml");
}
public RenderingRulesStorage defaultRender() {