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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-01-27 00:04:02 +01:00
commit c6cfda9fa9
5 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/res/layout/dashboard.xml
View file

@ -64,13 +64,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<fragment
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/TracksFragment"
android:name="net.osmand.plus.dashboard.DashTrackFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<!--<fragment-->
<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
<!--android:id="@+id/TracksFragment"-->
<!--android:name="net.osmand.plus.dashboard.DashTrackFragment"-->
<!--android:layout_marginTop="@dimen/dashCardMargin"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"/>-->
<!--<fragment-->
<!--xmlns:android="http://schemas.android.com/apk/res/android"-->

6
OsmAnd/res/values-fr/strings.xml
View file

@ -1896,7 +1896,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="speak_pedestrian">Annoncer les passages piéton</string>
<string name="rendering_value__name">Par défaut</string>
<string name="avoid_roads_msg">Vous pouvez générer un itinéraire alternatif en sélectionnant les routes à éviter.</string>
<string name="navigation_over_track">Démarrer la navigation sur les pistes ?</string>
<string name="navigation_over_track">Démarrer la navigation sur cette trace ?</string>
<string name="save_track_to_gpx_globally_headline">Enregistrement de traces à la demande</string>
<string name="recents">Récents</string>
<string name="proxy_pref_title">Proxy</string>
@ -1916,6 +1916,6 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="my_location">Ma position</string>
<string name="osm_editing_manage">Gérer</string>
<string name="gps_status">Statut GPS</string>
<string name="parking_place">Place de parking</string>
<string name="remove_the_tag">Enlever l\'attribut</string>
<string name="parking_place">Place de stationnement</string>
<string name="remove_the_tag">Retirer l\'étiquette</string>
</resources>

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

@ -2065,4 +2065,6 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="my_location">La mia posizione</string>
<string name="osm_editing_manage">Gestisci</string>
<string name="gps_status">Stato GPS</string>
<string name="parking_place">Parcheggio</string>
<string name="remove_the_tag">RIMUOVI IL TAG</string>
</resources>

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

@ -2128,4 +2128,6 @@
<string name="my_location">내 위치</string>
<string name="osm_editing_manage">관리</string>
<string name="gps_status">GPS status</string>
<string name="parking_place">주차장</string>
<string name="remove_the_tag">태그를 제거</string>
</resources>

3
OsmAnd/res/values-sk/strings.xml
View file

@ -2048,4 +2048,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="tracks">Stopy</string>
<string name="my_location">Moja poloha</string>
<string name="osm_editing_manage">Spravovať</string>
<string name="parking_place">Parkovacie miesto</string>
<string name="remove_the_tag">ODSTRÁNIŤ ZNAČKU</string>
<string name="gps_status">Stav GPS</string>
</resources>