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

Merge branch 'master' into app_profiles

Browse source
This commit is contained in:
madwasp79 2019-05-15 10:20:46 +03:00
commit be56a5a120
148 changed files with 4864 additions and 3074 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.travis.yml
View file

@ -1,14 +0,0 @@
language: android
# Work in progress. Repo should be used for initial checkout https://github.com/osmandapp/OsmAnd-manifest/blob/master/android_build.xml
android:
components:
- tools
- platform-tools
# The BuildTools version used by your project
- build-tools-27.0.3
- android-27
script: ./gradlew test

10
OsmAnd-java/build.gradle
View file

@ -1,5 +1,5 @@
apply plugin: 'java'
apply plugin: 'maven-publish'
configurations {
android
@ -77,6 +77,14 @@ artifacts {
android androidJar
}
publishing {
publications {
maven(MavenPublication) {
artifactId "osmand-base"
from components.java
}
}
}
dependencies {
testImplementation 'junit:junit:4.12'

BIN
OsmAnd-telegram/res/drawable-hdpi/ic_action_additional_option.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 210 B

BIN
OsmAnd-telegram/res/drawable-mdpi/ic_action_additional_option.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 163 B

BIN
OsmAnd-telegram/res/drawable-xhdpi/ic_action_additional_option.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 239 B

BIN
OsmAnd-telegram/res/drawable-xxhdpi/ic_action_additional_option.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 319 B

BIN
OsmAnd-telegram/res/drawable-xxxhdpi/ic_action_additional_option.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 423 B

30
OsmAnd-telegram/res/layout/fragement_settings_dialog.xml
View file

@ -5,6 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
@ -103,6 +104,35 @@
<include layout="@layout/list_item_divider"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color"
android:orientation="vertical">
<net.osmand.telegram.ui.views.TextViewEx
android:layout_width="match_parent"
android:layout_height="@dimen/list_header_height"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:text="@string/privacy"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/list_item_title_text_size"
app:typeface="@string/font_roboto_medium"/>
<LinearLayout
android:id="@+id/proxy_settings_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"/>
</LinearLayout>
<include layout="@layout/list_item_divider"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

350
OsmAnd-telegram/res/layout/fragment_proxy_settings_dialog.xml Normal file
View file

@ -0,0 +1,350 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/action_bar_height">
<net.osmand.telegram.ui.views.TextViewEx
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:text="@string/proxy_settings"
android:textColor="@color/app_bar_title_light"
android:textSize="@dimen/title_text_size"
app:typeface="@string/font_roboto_mono_bold" />
</android.support.v7.widget.Toolbar>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:layout_marginStart="@dimen/content_padding_standard"
android:layout_marginLeft="@dimen/content_padding_standard"
android:background="?attr/card_divider_color" />
<LinearLayout
android:id="@+id/enable_proxy_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:minHeight="50dp"
android:orientation="horizontal"
tools:background="@color/card_bg_light">
<net.osmand.telegram.ui.views.TextViewEx
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:text="@string/shared_string_enable"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/list_item_title_text_size"
app:typeface="@string/font_roboto_regular" />
<Switch
android:id="@+id/switcher"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard" />
</LinearLayout>
</android.support.design.widget.AppBarLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/list_view_bottom_padding_big">
<include layout="@layout/list_item_divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color"
android:orientation="vertical">
<net.osmand.telegram.ui.views.TextViewEx
android:layout_width="match_parent"
android:layout_height="@dimen/list_header_height"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:text="@string/proxy_type"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/list_item_title_text_size"
app:typeface="@string/font_roboto_medium" />
<LinearLayout
android:id="@+id/proxy_type_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
</LinearLayout>
<include layout="@layout/list_item_divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color"
android:orientation="vertical">
<net.osmand.telegram.ui.views.TextViewEx
android:layout_width="match_parent"
android:layout_height="@dimen/list_header_height"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:text="@string/shared_string_connection"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/list_item_title_text_size"
app:typeface="@string/font_roboto_medium" />
<LinearLayout
android:id="@+id/connection_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:paddingBottom="@dimen/content_padding_standard">
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
android:layout_marginBottom="@dimen/content_padding_standard"
app:hasClearButton="true"
app:labelText="@string/proxy_server">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/server_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text" />
</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
app:hasClearButton="true"
app:labelText="@string/proxy_port">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/port_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberDecimal" />
</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/proxy_sosks5_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/list_item_divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color"
android:orientation="vertical">
<net.osmand.telegram.ui.views.TextViewEx
android:layout_width="match_parent"
android:layout_height="@dimen/list_header_height"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:text="@string/proxy_credentials"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/list_item_title_text_size"
app:typeface="@string/font_roboto_medium" />
<LinearLayout
android:id="@+id/credentials_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:paddingBottom="@dimen/content_padding_standard">
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
android:layout_marginBottom="@dimen/content_padding_standard"
app:hasClearButton="true"
app:labelText="@string/proxy_username">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/username_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text" />
</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
app:hasClearButton="true"
app:labelText="@string/proxy_password">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/password_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword" />
</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/proxy_mtproto_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/list_item_divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color"
android:orientation="vertical">
<net.osmand.telegram.ui.views.TextViewEx
android:layout_width="match_parent"
android:layout_height="@dimen/list_header_height"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:text="@string/proxy_credentials"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/list_item_title_text_size"
app:typeface="@string/font_roboto_medium" />
<LinearLayout
android:id="@+id/mtproto_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingRight="@dimen/content_padding_standard"
android:paddingBottom="@dimen/content_padding_standard">
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
android:layout_marginBottom="@dimen/content_padding_standard"
app:hasClearButton="true"
app:labelText="@string/proxy_key">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
android:id="@+id/key_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text" />
</studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<include layout="@layout/card_bottom_divider" />
</LinearLayout>
</ScrollView>
</LinearLayout>
<LinearLayout
android:id="@+id/save_button_Container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
<android.support.v7.widget.AppCompatImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="?attr/bottom_nav_shadow" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/proxy_save_button_height"
android:layout_gravity="bottom"
android:background="?attr/card_bg_color"
android:orientation="vertical"
android:paddingLeft="@dimen/content_padding_standard"
android:paddingTop="@dimen/image_button_padding"
android:paddingRight="@dimen/content_padding_standard"
android:paddingBottom="@dimen/image_button_padding">
<include layout="@layout/primary_btn" />
</LinearLayout>
</LinearLayout>
</FrameLayout>

1
OsmAnd-telegram/res/layout/fragment_search_dialog.xml
View file

@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout

12
OsmAnd-telegram/res/layout/item_with_descr_and_right_switch.xml
View file

@ -50,6 +50,18 @@
</LinearLayout>
<ImageView
android:id="@+id/icon_right"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/image_button_padding"
android:paddingRight="@dimen/image_button_padding"
android:visibility="gone"
tools:src="@drawable/ic_action_additional_option"
tools:tint="@color/icon_light"
tools:visibility="visible" />
<Switch
android:id="@+id/switcher"
android:layout_width="wrap_content"

18
OsmAnd-telegram/res/values-be/strings.xml
View file

@ -217,4 +217,22 @@
<string name="search_contacts_descr">Шукаць ва ўсіх вашых групах і кантактах.</string>
<string name="type_contact_or_group_name">Увядзіце назву групы альбо кантакта</string>
<string name="shared_string_search">Пошук</string>
<string name="direction">Накірунак</string>
<string name="precision">Дакладнасць</string>
<string name="altitude">Вышыня над узроўнем мора</string>
<string name="proxy_key">Ключ</string>
<string name="proxy_password">Пароль</string>
<string name="proxy_username">Імя карыстальніка</string>
<string name="proxy_credentials">Пасведчанні</string>
<string name="proxy_port">Порт</string>
<string name="proxy_server">Сервер</string>
<string name="shared_string_connection">Злучэнне</string>
<string name="shared_string_enable">Уключыць</string>
<string name="proxy_type">Тып проксі</string>
<string name="proxy_connected">Злучана</string>
<string name="proxy_disconnected">Адлучана</string>
<string name="proxy_settings">Налады проксі</string>
<string name="proxy">Проксі</string>
<string name="privacy">Прыватнасць</string>
<string name="bearing">Накірунак</string>
</resources>

14
OsmAnd-telegram/res/values-ca/strings.xml
View file

@ -221,4 +221,18 @@
<string name="precision">Precisió</string>
<string name="altitude">Altitud</string>
<string name="bearing">Trajectòria</string>
<string name="proxy_key">Clau</string>
<string name="proxy_password">Contrasenya</string>
<string name="proxy_username">Nom d\'usuari</string>
<string name="proxy_credentials">Credencials</string>
<string name="proxy_port">Port</string>
<string name="proxy_server">Servidor</string>
<string name="shared_string_connection">Connexió</string>
<string name="shared_string_enable">Activa</string>
<string name="proxy_type">Tipus de servidor intermediari</string>
<string name="proxy_connected">Connectat</string>
<string name="proxy_disconnected">Desconnectat</string>
<string name="proxy_settings">Configuració del servidor intermediari</string>
<string name="proxy">Servidor intermediari</string>
<string name="privacy">Privacitat</string>
</resources>

19
OsmAnd-telegram/res/values-da/strings.xml
View file

@ -19,7 +19,7 @@
<string name="add_device">Tilføj enhed</string>
<string name="share_location_as">Del placering som</string>
<string name="live_now_description">Kontakter og grupper som der deles placering med.</string>
<string name="logout_from_osmand_telegram_descr">"Bekræft logge ud af OsmAnd Tracker, så kan der ikke deles placering eller se placeringen af andre\?"</string>
<string name="logout_from_osmand_telegram_descr">"Bekræft log af OsmAnd Tracker, der kan ikke deles placering eller se placering af andre\?"</string>
<string name="logout_from_osmand_telegram">Log ud af OsmAnd Telegram\?</string>
<string name="shared_string_name">Navn</string>
<string name="by_distance">Efter afstand</string>
@ -38,7 +38,7 @@
<string name="shared_string_group">Gruppe</string>
<string name="logout_no_internet_msg">Opret forbindelse til Internettet for at logge ud af Telegram.</string>
<string name="shared_string_close">Luk</string>
<string name="disconnect_from_telegram_desc">"Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Telegram session. "</string>
<string name="disconnect_from_telegram_desc">Sådan tilbagekaldes adgang til placeringsdeling. Åbn Telegram, gå til Settings - Privacy and Security - Sessions og afslut OsmAnd Telegram session.</string>
<string name="disconnect_from_telegram">Sådan afbrydes OsmAnd Tracker fra Telegram</string>
<string name="logout_help_desc">Sådan afbrydes OsmAnd Tracker fra Telegram</string>
<string name="connected_account">Tilsluttet konto</string>
@ -220,4 +220,19 @@
<string name="direction">Retning</string>
<string name="altitude">Højde</string>
<string name="bearing">Kurs</string>
<string name="proxy_key">Nøgle</string>
<string name="proxy_password">Adgangskode</string>
<string name="proxy_username">Brugernavn</string>
<string name="proxy_credentials">Legitimationsoplysninger</string>
<string name="proxy_port">Port</string>
<string name="proxy_server">Server</string>
<string name="shared_string_connection">Forbindelse</string>
<string name="shared_string_enable">Aktiver</string>
<string name="proxy_type">Proxytype</string>
<string name="proxy_connected">Forbundet</string>
<string name="proxy_disconnected">Afbrudt</string>
<string name="proxy_settings">Proxy-indstillinger</string>
<string name="proxy">Proxy</string>
<string name="privacy">Privatliv</string>
<string name="precision">Præcision</string>
</resources>

16
OsmAnd-telegram/res/values-de/strings.xml
View file

@ -145,7 +145,7 @@
<string name="turn_off_location_sharing">Standortfreigabe ausschalten</string>
<string name="shared_string_bot">Bot</string>
<string name="set_visible_time_for_all">Für alle sichtbare Zeit einstellen</string>
<string name="set_time_description">Zeit einstellen, zu der Ihren Kontakten und Gruppen Ihr Standorts in Echtzeit angezeigt wird.</string>
<string name="set_time_description">Stellen Sie die Zeit ein, zu der Ihren ausgewählten Kontakten und Gruppen Ihr Standort in Echtzeit angezeigt wird.</string>
<string name="location_sharing_description">Kontakte und Gruppen wählen, denen Sie Ihren Standort freigeben möchten.</string>
<string name="start_location_sharing">Standort freigeben</string>
<string name="location_service_no_gps_available">Wählen Sie einen der Standortanbieter aus, um Ihren Standort freizugeben.</string>
@ -221,4 +221,18 @@
<string name="precision">Genauigkeit</string>
<string name="altitude">Höhe</string>
<string name="bearing">Peilung</string>
<string name="proxy_key">Schlüssel</string>
<string name="proxy_password">Passwort</string>
<string name="proxy_username">Benutzername</string>
<string name="proxy_credentials">Anmeldeinformationen</string>
<string name="proxy_port">Port</string>
<string name="proxy_server">Server</string>
<string name="shared_string_connection">Verbindung</string>
<string name="shared_string_enable">Aktivieren</string>
<string name="proxy_type">Proxy-Typ</string>
<string name="proxy_connected">Verbunden</string>
<string name="proxy_disconnected">Getrennt</string>
<string name="proxy_settings">Proxy-Einstellungen</string>
<string name="proxy">Proxy</string>
<string name="privacy">Datenschutz</string>
</resources>

14
OsmAnd-telegram/res/values-es-rUS/strings.xml
View file

@ -220,4 +220,18 @@
<string name="precision">Precisión</string>
<string name="altitude">Altitud</string>
<string name="bearing">Rumbo</string>
<string name="proxy_key">Clave</string>
<string name="proxy_password">Contraseña</string>
<string name="proxy_username">Nombre de usuario</string>
<string name="proxy_credentials">Credenciales</string>
<string name="proxy_port">Puerto</string>
<string name="proxy_server">Servidor</string>
<string name="shared_string_connection">Conexión</string>
<string name="shared_string_enable">Activar</string>
<string name="proxy_type">Tipo de proxy</string>
<string name="proxy_connected">Conectado</string>
<string name="proxy_disconnected">Desconectado</string>
<string name="proxy_settings">Ajustes del proxy</string>
<string name="proxy">Proxy</string>
<string name="privacy">Privacidad</string>
</resources>

141
OsmAnd-telegram/res/values-eu/strings.xml Normal file
View file

@ -0,0 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="direction">Norabidea</string>
<string name="precision">Zehaztasuna</string>
<string name="altitude">Altitudea</string>
<string name="bearing">Orientazioa</string>
<string name="search_contacts">Bilatu kontaktuak</string>
<string name="type_contact_or_group_name">Idatzi kontaktu edo talde izena</string>
<string name="shared_string_search">Bilatu</string>
<string name="shared_string_ok">ADOS</string>
<string name="disable_monitoring">Desgaitu kontrola</string>
<string name="location_recording_enabled">Kokapen grabaketa gaituta</string>
<string name="timeline_description">Gaitu kontrola zure kokapen guztiak historian gordetzeko.</string>
<string name="app_name_short_online">Online Aztarnaria</string>
<string name="app_name_short">OsmAnd Aztarnaria</string>
<string name="shared_string_telegram">Telegram</string>
<string name="privacy_policy_use_telegram">Telegram (mezularitza aplikazioa) jendearekin konektatzeko eta komunikatzeko erabiltzen da.</string>
<string name="shared_string_accept">Onartu</string>
<string name="telegram_privacy_policy">Telegram Pribatutasun Politika</string>
<string name="osmand_privacy_policy">OsmAnd Pribatutasun Politika</string>
<string name="how_it_works">Zelan dabil</string>
<string name="shared_string_appearance">Itxura</string>
<string name="show_gps_points">Erakutsi GPS puntuak</string>
<string name="shared_string_update">Eguneratu</string>
<string name="shared_string_date">Data</string>
<string name="gps_points">GPs puntuak</string>
<string name="shared_string_sent">Bidalita</string>
<string name="open_in_osmand">Erakutsi OsmAnd-en</string>
<string name="end_date">Bukaera data</string>
<string name="start_date">Hasiera data</string>
<string name="shared_string_map">Mapa</string>
<string name="shared_string_text">Testua</string>
<string name="map_and_text">Mapa eta testua</string>
<string name="last_update_from_telegram">Azken eguneraketa Telegram-etik</string>
<string name="shared_string_add">Gehitu</string>
<string name="error_adding_new_device">Ezin izan da gailu berri bat gehitu</string>
<string name="device_name_is_too_long">Gailuaren izena luzeegia</string>
<string name="device_name_cannot_be_empty">Gailuaren izena ezin da hutsik egon</string>
<string name="device_name">Gailuaren izena</string>
<string name="shared_string_hide">Ezkutatu</string>
<string name="sending_location_messages">Kokapena bidaltzen</string>
<string name="initializing">Abiarazten</string>
<string name="searching_for_gps">Kokalekua…</string>
<string name="connecting_to_the_internet">Internetera konektatzen</string>
<string name="go_to_settings">Ezarpenetara joan</string>
<string name="shared_string_later">Gero</string>
<string name="re_send_location">Birbidali kokapena</string>
<string name="shared_string_status">Egoera</string>
<string name="no_gps_connection">GPS konexiorik ez</string>
<string name="no_internet_connection">Internet konexiorik ez</string>
<string name="shared_string_disable">Desgaitu</string>
<string name="shared_string_save">Gorde</string>
<string name="add_device">Gehitu gailua</string>
<string name="share_location_as">Partekatu kokapena honela</string>
<string name="shared_string_name">Izena</string>
<string name="shared_string_sort">Ordenatu</string>
<string name="shared_string_sort_by">Ordenatu honen arabera</string>
<string name="choose_osmand">Aukeratu erabili nahi duzun OsmAnd bertsioa</string>
<string name="disable_all_sharing">Desgaitu partekatze guztiak</string>
<string name="turn_off_all">Desaktibatu guztia</string>
<string name="shared_string_exit">Irten</string>
<string name="time_ago">lehenago</string>
<string name="shared_string_group">Taldea</string>
<string name="shared_string_close">Itxi</string>
<string name="connected_account">Konektatutako kontua</string>
<string name="shared_string_account">Kontua</string>
<string name="location_history">Kokapen historia</string>
<string name="send_my_location">Bidali nire kokapena</string>
<string name="gps_and_location">Posizioa</string>
<string name="open_osmand">Ireki OsmAnd</string>
<string name="shared_string_live">Zuzenean</string>
<string name="shared_string_bot">Bot</string>
<string name="get_telegram_description_continue">Mesedez instalatu Telegram eta konfiguratu kontu bat.</string>
<string name="shared_string_all">Guztia</string>
<string name="enter_phone_number">Sartu telefono zenbakia</string>
<string name="shared_string_install">Instalatu</string>
<string name="shared_string_share">Partekatu</string>
<string name="shared_string_back">Atzera</string>
<string name="start_location_sharing">Partekatu kokapena</string>
<string name="show_on_map">Erakutsi mapan</string>
<string name="app_name">OsmAnd Telegram</string>
<string name="phone_number_title">Telefono zenbakia</string>
<string name="phone_number_descr">Telefono zenbakia formatu internazionalean</string>
<string name="shared_string_password">Pasahitza</string>
<string name="enter_code">Sartu kodea</string>
<string name="authentication_code">Authentication kodea</string>
<string name="enter_password">Sartu pasahitza</string>
<string name="password_descr">Telegram pasahitza</string>
<string name="shared_string_login">Saioa hasi</string>
<string name="shared_string_logout">Saioa itxi</string>
<string name="initialization">Abiarazten</string>
<string name="logging_out">Saioa ixten</string>
<string name="closing">Ixten</string>
<string name="gps_network_not_enabled">Aktibatu \"Kokapena\"\?</string>
<string name="not_logged_in">Ez duzu saioa hasi</string>
<string name="shared_string_continue">Jarraitu</string>
<string name="shared_string_cancel">Utzi</string>
<string name="shared_string_settings">Ezarpenak</string>
<string name="gps_not_available">Mesedez aktibatu \"Kokapena\" sistemaren ezarpenetan</string>
<string name="osmand_service">Atzeko plano modua</string>
<string name="shared_string_distance">Distantzia</string>
<string name="share_location">Partekatu kokapena</string>
<string name="sharing_location">Partekatzen kokapena</string>
<string name="process_service">OsmAnd Telegram zebitzua</string>
<string name="osmand_logo">OsmAnd logoa</string>
<string name="install_osmand_dialog_message">OsmAnd doako edo ordainpeko bertsioa instalatu behar duzu lehenik</string>
<string name="install_osmand">Instalatu OsmAnd</string>
<string name="show_users_on_map">Erakutsi erabiltzaileak mapan</string>
<string name="active_chats">Aktibatu txata</string>
<string name="shared_string_authorization">Baimena</string>
<string name="shared_string_welcome">Ongi etorri</string>
<string name="yard">yd</string>
<string name="foot">oin</string>
<string name="mile">mi</string>
<string name="km">km</string>
<string name="m">m</string>
<string name="nm">nmi</string>
<string name="min_mile">min/m</string>
<string name="min_km">min/km</string>
<string name="nm_h">nmi/h</string>
<string name="m_s">m/s</string>
<string name="km_h">km/h</string>
<string name="mile_per_hour">mph</string>
<string name="si_kmh">Kilometro orduko</string>
<string name="si_mph">Milia orduko</string>
<string name="si_m_s">Metro segunduko</string>
<string name="si_min_km">Minutu kilometroko</string>
<string name="si_min_m">Minutu miliaro</string>
<string name="si_nm_h">Milia nautikoa orduro (knot)</string>
<string name="si_mi_feet">Miliak/Oin</string>
<string name="si_mi_yard">Miliak/yardak</string>
<string name="si_km_m">Kilometroak/metroak</string>
<string name="si_nm">Milia nautikoak</string>
<string name="si_mi_meters">Miliak/metroak</string>
<string name="shared_string_hour_short">o</string>
<string name="shared_string_minute_short">min</string>
<string name="shared_string_second_short">seg</string>
<string name="my_location">Nire kokapena</string>
<string name="live_now">Zuzenean orain</string>
<string name="timeline">Denbora-eskala</string>
</resources>

14
OsmAnd-telegram/res/values-he/strings.xml
View file

@ -220,4 +220,18 @@
<string name="precision">דיוק</string>
<string name="altitude">גובה</string>
<string name="bearing">תכווין</string>
<string name="proxy_key">מפתח</string>
<string name="proxy_password">ססמה</string>
<string name="proxy_username">שם משתמש</string>
<string name="proxy_credentials">פרטי גישה</string>
<string name="proxy_port">פתחה</string>
<string name="proxy_server">שרת</string>
<string name="shared_string_connection">חיבור</string>
<string name="shared_string_enable">הפעלה</string>
<string name="proxy_type">סוג מתווך</string>
<string name="proxy_connected">מחובר</string>
<string name="proxy_disconnected">מנותק</string>
<string name="proxy_settings">הגדרות מתווך</string>
<string name="proxy">מתווך</string>
<string name="privacy">פרטיות</string>
</resources>

16
OsmAnd-telegram/res/values-nb/strings.xml
View file

@ -187,7 +187,7 @@
<string name="start_date">Startdato</string>
<string name="timeline">Tidslinje</string>
<string name="shared_string_telegram">Telegram</string>
<string name="privacy_policy_telegram_client">OsmAnd-sporeren er én av kundene som bruker Telegram. Dine kontakter kan bruke enhver annen Telegram-klient.</string>
<string name="privacy_policy_telegram_client">OsmAnd-sporeren er én av klientene som bruker Telegram. Dine kontakter kan bruke enhver annen Telegram-klient.</string>
<string name="privacy_policy_agree">Ved å klikke \"Fortsett\" samtykker du til vilkårene i Telegram-personvernspraksisen, og OsmAnd-personvernspraksisen.</string>
<string name="shared_string_accept">Godta</string>
<string name="telegram_privacy_policy">Telegram-personvernspraksis</string>
@ -221,4 +221,18 @@
<string name="precision">Nøyaktighet</string>
<string name="altitude">Høyde</string>
<string name="bearing">Kurs</string>
<string name="proxy_key">Nøkkel</string>
<string name="proxy_password">Passord</string>
<string name="proxy_username">Brukernavn</string>
<string name="proxy_credentials">Identitetsdetaljer</string>
<string name="proxy_port">Port</string>
<string name="proxy_server">Tjener</string>
<string name="shared_string_connection">Forbindelse</string>
<string name="shared_string_enable">Skru på</string>
<string name="proxy_type">Mellomtjenertype</string>
<string name="proxy_connected">Tilkoblet</string>
<string name="proxy_disconnected">Frakoblet</string>
<string name="proxy_settings">Mellomtjener-innstillinger</string>
<string name="proxy">Mellomtjener</string>
<string name="privacy">Personvern</string>
</resources>

15
OsmAnd-telegram/res/values-pl/strings.xml
View file

@ -222,4 +222,19 @@
<string name="direction">Kierunek</string>
<string name="precision">Precyzja</string>
<string name="altitude">Wysokość</string>
<string name="proxy_key">Klucz</string>
<string name="proxy_password">Hasło</string>
<string name="proxy_username">Nazwa użytkownika</string>
<string name="proxy_credentials">Poświadczenia</string>
<string name="proxy_port">Port</string>
<string name="proxy_server">Serwer</string>
<string name="shared_string_connection">Połączenia</string>
<string name="shared_string_enable">Włącz</string>
<string name="proxy_type">Typ serwera proxy</string>
<string name="proxy_connected">Podłączony</string>
<string name="proxy_disconnected">Odłączony</string>
<string name="proxy_settings">Ustawienia proxy</string>
<string name="proxy">Serwer proxy</string>
<string name="privacy">Prywatność</string>
<string name="bearing">Kierunek</string>
</resources>

18
OsmAnd-telegram/res/values-pt-rBR/strings.xml
View file

@ -217,4 +217,22 @@
<string name="search_contacts_descr">Pesquise em todos os seus grupos e contatos.</string>
<string name="type_contact_or_group_name">Digite o nome do contato ou do grupo</string>
<string name="shared_string_search">Pesquisar</string>
<string name="direction">Direção</string>
<string name="precision">Precisão</string>
<string name="altitude">Altitude</string>
<string name="bearing">Rolamento</string>
<string name="proxy_key">Chave</string>
<string name="proxy_password">Senha</string>
<string name="proxy_username">Nome de usuário</string>
<string name="proxy_credentials">Credenciais</string>
<string name="proxy_port">Port</string>
<string name="proxy_server">Servidor</string>
<string name="shared_string_connection">Conexão</string>
<string name="shared_string_enable">Ativar</string>
<string name="proxy_type">Tipo de proxy</string>
<string name="proxy_connected">Conectado</string>
<string name="proxy_disconnected">Desconectado</string>
<string name="proxy_settings">Configurações de proxy</string>
<string name="proxy">Proxy</string>
<string name="privacy">Privacidade</string>
</resources>

16
OsmAnd-telegram/res/values-sc/strings.xml
View file

@ -218,4 +218,20 @@
<string name="shared_string_search">Chirca</string>
<string name="precision">Pretzisione</string>
<string name="altitude">Artària</string>
<string name="direction">Diretzione</string>
<string name="proxy_key">Crae servidore</string>
<string name="proxy_password">Crae de intrada</string>
<string name="proxy_username">Nùmene impreadore</string>
<string name="proxy_credentials">Credentziales</string>
<string name="proxy_port">Ghenna</string>
<string name="proxy_server">Servidore</string>
<string name="shared_string_connection">Connessione</string>
<string name="shared_string_enable">Abìlita</string>
<string name="proxy_type">Casta de servidore intermediàriu</string>
<string name="proxy_connected">Connessu</string>
<string name="proxy_disconnected">Disconnessu</string>
<string name="proxy_settings">Impostatziones de su servidore intermediàriu</string>
<string name="proxy">Servidore intermediàriu (proxy)</string>
<string name="privacy">Privadesa</string>
<string name="bearing">Andamentu</string>
</resources>

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

@ -222,4 +222,18 @@
<string name="precision">精確</string>
<string name="altitude">高度</string>
<string name="bearing">方位</string>
<string name="proxy_key">金鑰</string>
<string name="proxy_password">密碼</string>
<string name="proxy_username">使用者名稱</string>
<string name="proxy_credentials">憑證</string>
<string name="proxy_port">連接埠</string>
<string name="proxy_server">伺服器</string>
<string name="shared_string_connection">連線</string>
<string name="shared_string_enable">啟用</string>
<string name="proxy_type">代理伺服器類型</string>
<string name="proxy_connected">已連線</string>
<string name="proxy_disconnected">已斷線</string>
<string name="proxy_settings">代理伺服器設定</string>
<string name="proxy">代理伺服器</string>
<string name="privacy">隱私</string>
</resources>

3
OsmAnd-telegram/res/values/dimens.xml
View file

@ -44,6 +44,7 @@
<dimen name="list_item_baseline_to_top_height_big">28dp</dimen>
<dimen name="list_view_bottom_padding">52dp</dimen>
<dimen name="list_view_bottom_padding_big">140dp</dimen>
<dimen name="card_divider_bottom_margin">6dp</dimen>
@ -73,6 +74,8 @@
<dimen name="list_popup_window_height">300dp</dimen>
<dimen name="proxy_save_button_height">60dp</dimen>
<!-- Text sizes -->
<dimen name="dialog_title_text_size">22sp</dimen>

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

@ -1,5 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="proxy_key">Key</string>
<string name="proxy_password">Password</string>
<string name="proxy_username">Username</string>
<string name="proxy_credentials">Credentials</string>
<string name="proxy_port">Port</string>
<string name="proxy_server">Server</string>
<string name="shared_string_connection">Connection</string>
<string name="shared_string_enable">Enable</string>
<string name="proxy_type">Proxy type</string>
<string name="proxy_connected">Connected</string>
<string name="proxy_disconnected">Disconnected</string>
<string name="proxy_settings">Proxy Settings</string>
<string name="proxy">Proxy</string>
<string name="privacy">Privacy</string>
<string name="direction">Direction</string>
<string name="precision">Precision</string>
<string name="altitude">Altitude</string>

131
OsmAnd-telegram/src/net/osmand/telegram/TelegramSettings.kt
View file

@ -85,6 +85,9 @@ private const val MONITORING_ENABLED = "monitoring_enabled"
private const val SHOW_GPS_POINTS = "show_gps_points"
private const val PROXY_ENABLED = "proxy_enabled"
private const val PROXY_PREFERENCES_KEY = "proxy_preferences"
private const val SHARING_INITIALIZATION_TIME = 60 * 2L // 2 minutes
private const val WAITING_TDLIB_TIME = 30 // 2 seconds
@ -103,6 +106,9 @@ class TelegramSettings(private val app: TelegramApplication) {
var currentSharingMode = ""
private set
var currentProxyPref: ProxyPref = ProxySOCKS5Pref(-1, "", -1, "", "")
private set
var metricsConstants = MetricsConstants.KILOMETERS_AND_METERS
var speedConstants = SpeedConstants.KILOMETERS_PER_HOUR
@ -124,9 +130,12 @@ class TelegramSettings(private val app: TelegramApplication) {
var showGpsPoints = false
var proxyEnabled = false
init {
updatePrefs()
read()
applyProxyPref()
}
fun hasAnyChatToShareLocation() = shareChatsInfo.isNotEmpty()
@ -202,6 +211,30 @@ class TelegramSettings(private val app: TelegramApplication) {
currentSharingMode = sharingMode
}
fun updateCurrentProxyPref(proxyPref: ProxyPref, proxyEnabled: Boolean) {
this.proxyEnabled = proxyEnabled
currentProxyPref = proxyPref
applyProxyPref()
}
fun updateProxySetting(enable: Boolean) {
this.proxyEnabled = enable
if (enable) {
app.telegramHelper.enableProxy(currentProxyPref.id)
} else {
app.telegramHelper.disableProxy()
}
}
fun applyProxyPref() {
val proxyId = currentProxyPref.id
if (proxyId != -1) {
app.telegramHelper.editProxyPref(currentProxyPref, proxyEnabled)
} else {
app.telegramHelper.addProxyPref(currentProxyPref, proxyEnabled)
}
}
fun prepareForSharingNewMessages() {
shareChatsInfo.forEach { (_, shareInfo) ->
prepareForSharingNewMessages(shareInfo)
@ -536,6 +569,8 @@ class TelegramSettings(private val app: TelegramApplication) {
edit.putBoolean(SHOW_GPS_POINTS, showGpsPoints)
edit.putBoolean(PROXY_ENABLED, proxyEnabled)
val jArray = convertShareChatsInfoToJson()
if (jArray != null) {
edit.putString(SHARE_CHATS_INFO_KEY, jArray.toString())
@ -546,6 +581,11 @@ class TelegramSettings(private val app: TelegramApplication) {
edit.putString(SHARE_DEVICES_KEY, jsonObject.toString())
}
val jsonObjectProxy = convertProxyPrefToJson()
if (jsonObjectProxy != null) {
edit.putString(PROXY_PREFERENCES_KEY, jsonObjectProxy.toString())
}
edit.apply()
}
@ -597,7 +637,14 @@ class TelegramSettings(private val app: TelegramApplication) {
monitoringEnabled = prefs.getBoolean(MONITORING_ENABLED,false)
showGpsPoints = prefs.getBoolean(SHOW_GPS_POINTS,false)
showGpsPoints = prefs.getBoolean(SHOW_GPS_POINTS, false)
proxyEnabled = prefs.getBoolean(PROXY_ENABLED, false)
try {
parseProxyPreferences(JSONObject(prefs.getString(PROXY_PREFERENCES_KEY, "")))
} catch (e: JSONException) {
e.printStackTrace()
}
}
private fun convertShareDevicesToJson():JSONObject?{
@ -621,6 +668,27 @@ class TelegramSettings(private val app: TelegramApplication) {
}
}
private fun convertProxyPrefToJson(): JSONObject? {
return try {
val proxyPref = currentProxyPref
JSONObject().apply {
put(ProxyPref.PROXY_ID, proxyPref.id)
put(ProxyPref.TYPE_ID, proxyPref.type)
put(ProxyPref.SERVER_ID, proxyPref.server)
put(ProxyPref.PORT_ID, proxyPref.port)
if (proxyPref is ProxyMTProtoPref) {
put(ProxyMTProtoPref.KEY_ID, proxyPref.key)
} else if (proxyPref is ProxySOCKS5Pref) {
put(ProxySOCKS5Pref.LOGIN_ID, proxyPref.login)
put(ProxySOCKS5Pref.PASSWORD_ID, proxyPref.password)
}
}
} catch (e: JSONException) {
e.printStackTrace()
null
}
}
private fun convertShareChatsInfoToJson(): JSONArray? {
return try {
val jArray = JSONArray()
@ -678,6 +746,28 @@ class TelegramSettings(private val app: TelegramApplication) {
}
}
private fun parseProxyPreferences(jsonObject: JSONObject) {
val proxyId = jsonObject.optInt(ProxyPref.PROXY_ID)
val typeString = jsonObject.optString(ProxyPref.TYPE_ID)
val server = jsonObject.optString(ProxyPref.SERVER_ID)
val port = jsonObject.optInt(ProxyPref.PORT_ID)
val proxyPref = when {
ProxyType.valueOf(typeString) == ProxyType.MTPROTO -> {
val key = jsonObject.optString(ProxyMTProtoPref.KEY_ID)
ProxyMTProtoPref(proxyId, server, port, key)
}
ProxyType.valueOf(typeString) == ProxyType.SOCKS5 -> {
val login = jsonObject.optString(ProxySOCKS5Pref.LOGIN_ID)
val password = jsonObject.optString(ProxySOCKS5Pref.PASSWORD_ID)
ProxySOCKS5Pref(proxyId, server, port, login, password)
}
else -> null
}
if (proxyPref != null) {
currentProxyPref = proxyPref
}
}
private fun parseShareDevices(json: String) {
shareDevices = OsmandApiUtils.parseJsonContents(json).toHashSet()
}
@ -926,6 +1016,45 @@ class TelegramSettings(private val app: TelegramApplication) {
}
}
enum class ProxyType {
MTPROTO, SOCKS5
}
abstract class ProxyPref(
var id: Int,
var type: ProxyType,
open var server: String,
open var port: Int
) {
companion object {
internal const val PROXY_ID = "proxyId"
internal const val TYPE_ID = "type"
internal const val SERVER_ID = "serverId"
internal const val PORT_ID = "portId"
}
}
class ProxyMTProtoPref(id: Int, server: String, port: Int, var key: String) :
ProxyPref(id, ProxyType.MTPROTO, server, port) {
companion object {
internal const val KEY_ID = "key"
}
}
class ProxySOCKS5Pref(
id: Int,
server: String,
port: Int,
var login: String,
var password: String
) :
ProxyPref(id, ProxyType.SOCKS5, server, port) {
companion object {
internal const val LOGIN_ID = "login"
internal const val PASSWORD_ID = "password"
}
}
class SharingStatus {
var title: String = ""

74
OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramHelper.kt
View file

@ -683,6 +683,80 @@ class TelegramHelper private constructor() {
}
}
fun disableProxy() {
client?.send(TdApi.DisableProxy()) { obj ->
when (obj.constructor) {
TdApi.Error.CONSTRUCTOR -> {
val error = obj as TdApi.Error
if (error.code != IGNORED_ERROR_CODE) {
listener?.onTelegramError(error.code, error.message)
}
}
TdApi.Ok.CONSTRUCTOR -> {
}
}
}
}
fun enableProxy(proxyId: Int) {
client?.send(TdApi.EnableProxy(proxyId)) { obj ->
when (obj.constructor) {
TdApi.Error.CONSTRUCTOR -> {
val error = obj as TdApi.Error
if (error.code != IGNORED_ERROR_CODE) {
listener?.onTelegramError(error.code, error.message)
}
}
TdApi.Ok.CONSTRUCTOR -> {
}
}
}
}
fun addProxyPref(proxyPref: TelegramSettings.ProxyPref, enable: Boolean) {
val proxyType: TdApi.ProxyType? = when (proxyPref) {
is TelegramSettings.ProxyMTProtoPref -> TdApi.ProxyTypeMtproto(proxyPref.key)
is TelegramSettings.ProxySOCKS5Pref -> TdApi.ProxyTypeSocks5(proxyPref.login, proxyPref.password)
else -> null
}
client?.send(TdApi.AddProxy(proxyPref.server, proxyPref.port, enable, proxyType)) { obj ->
when (obj.constructor) {
TdApi.Error.CONSTRUCTOR -> {
val error = obj as TdApi.Error
if (error.code != IGNORED_ERROR_CODE) {
listener?.onTelegramError(error.code, error.message)
}
}
TdApi.Proxy.CONSTRUCTOR -> {
val proxy = (obj as TdApi.Proxy)
proxyPref.id = proxy.id
}
}
}
}
fun editProxyPref(proxyPref: TelegramSettings.ProxyPref, enable: Boolean) {
val proxyType: TdApi.ProxyType? = when (proxyPref) {
is TelegramSettings.ProxyMTProtoPref -> TdApi.ProxyTypeMtproto(proxyPref.key)
is TelegramSettings.ProxySOCKS5Pref -> TdApi.ProxyTypeSocks5(proxyPref.login, proxyPref.password)
else -> null
}
client?.send(TdApi.EditProxy(proxyPref.id, proxyPref.server, proxyPref.port, enable, proxyType)) { obj ->
when (obj.constructor) {
TdApi.Error.CONSTRUCTOR -> {
val error = obj as TdApi.Error
if (error.code != IGNORED_ERROR_CODE) {
listener?.onTelegramError(error.code, error.message)
}
}
TdApi.Proxy.CONSTRUCTOR -> {
val proxy = (obj as TdApi.Proxy)
proxyPref.id = proxy.id
}
}
}
}
fun createPrivateChatWithUser(
userId: Int,
shareInfo: TelegramSettings.ShareChatInfo,

26
OsmAnd-telegram/src/net/osmand/telegram/ui/LoginDialogFragment.kt
View file

@ -217,17 +217,23 @@ class LoginDialogFragment : BaseDialogFragment() {
welcomeImage?.visibility = View.GONE
}
val continueButton = view?.findViewById<Button>(R.id.welcome_continue_button)
continueButton?.setOnClickListener {
showWelcomeDialog = false
if (!privacyPolicyAgreed) {
loginDialogActiveType = LoginDialogType.PRIVACY_POLICY
showProgress = false
} else if (loginDialogActiveType == null) {
loginDialogActiveType = LoginDialogType.ENTER_PHONE_NUMBER
showProgress = true
view?.findViewById<Button>(R.id.welcome_continue_button)?.apply {
val params = layoutParams as ViewGroup.MarginLayoutParams
val bottomMargin = AndroidUtils.getNavBarHeight(context) + resources.getDimensionPixelSize(R.dimen.dialog_button_bottom_padding)
params.apply {
setMargins(leftMargin, topMargin, rightMargin, bottomMargin)
}
setOnClickListener {
showWelcomeDialog = false
if (!privacyPolicyAgreed) {
loginDialogActiveType = LoginDialogType.PRIVACY_POLICY
showProgress = false
} else if (loginDialogActiveType == null) {
loginDialogActiveType = LoginDialogType.ENTER_PHONE_NUMBER
showProgress = true
}
buildDialog(view)
}
buildDialog(view)
}
view?.findViewById<View>(R.id.login_layout)?.visibility = View.GONE
view?.findViewById<View>(R.id.welcome_layout)?.visibility = View.VISIBLE

217
OsmAnd-telegram/src/net/osmand/telegram/ui/ProxySettingsDialogFragment.kt Normal file
View file

@ -0,0 +1,217 @@
package net.osmand.telegram.ui
import android.os.Build
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.content.ContextCompat
import android.support.v7.widget.Toolbar
import android.text.Editable
import android.text.TextWatcher
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import android.widget.*
import net.osmand.telegram.R
import net.osmand.telegram.TelegramSettings.ProxyType
import net.osmand.telegram.TelegramSettings.ProxyPref
import net.osmand.telegram.TelegramSettings.ProxyMTProtoPref
import net.osmand.telegram.TelegramSettings.ProxySOCKS5Pref
class ProxySettingsDialogFragment : BaseDialogFragment() {
private val uiUtils get() = app.uiUtils
private lateinit var mainView: View
private lateinit var proxyEnableSwitcher: Switch
private lateinit var saveButtonContainer: LinearLayout
private lateinit var selectedProxyType: ProxyType
private lateinit var serverEditText: EditText
private lateinit var portEditText: EditText
override fun onCreateView(
inflater: LayoutInflater,
parent: ViewGroup?,
savedInstanceState: Bundle?
): View {
mainView = inflater.inflate(R.layout.fragment_proxy_settings_dialog, parent)
val window = dialog.window
if (window != null) {
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
if (Build.VERSION.SDK_INT >= 21) {
window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
}
}
mainView.findViewById<Toolbar>(R.id.toolbar).apply {
navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
setNavigationOnClickListener { dismiss() }
}
selectedProxyType = settings.currentProxyPref.type
mainView.findViewById<ViewGroup>(R.id.enable_proxy_btn).apply {
val title = findViewById<TextView>(R.id.title).apply {
text = if (settings.proxyEnabled) getText(R.string.shared_string_disable) else getText(
R.string.shared_string_enable
)
}
proxyEnableSwitcher = findViewById<Switch>(R.id.switcher).apply {
isChecked = settings.proxyEnabled
}
setOnClickListener {
val checked = !proxyEnableSwitcher.isChecked
proxyEnableSwitcher.isChecked = checked
title.text = if (checked) getText(R.string.shared_string_disable) else getText(R.string.shared_string_enable)
updateSaveButtonVisibility(true)
}
}
val container = mainView.findViewById<ViewGroup>(R.id.proxy_type_container)
ProxyType.values().forEach {
addItemToContainer(inflater, container, it)
}
serverEditText = mainView.findViewById<EditText>(R.id.server_edit_text).apply {
val server = settings.currentProxyPref.server
setText(server)
setSelection(server.length)
addTextChangedListener(object :
TextWatcher {
override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
override fun afterTextChanged(s: Editable) {
updateSaveButtonVisibility(s.isNotEmpty() && portEditText.text.isNotEmpty())
}
})
}
portEditText = mainView.findViewById<EditText>(R.id.port_edit_text).apply {
val port = settings.currentProxyPref.port
setText(if (port != -1) port.toString() else "")
addTextChangedListener(object :
TextWatcher {
override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
override fun afterTextChanged(s: Editable) {
updateSaveButtonVisibility(s.isNotEmpty() && serverEditText.text.isNotEmpty())
}
})
}
saveButtonContainer = mainView.findViewById<LinearLayout>(R.id.save_button_Container).apply {
findViewById<TextView>(R.id.primary_btn).apply {
text = getString(R.string.shared_string_save)
setOnClickListener {
saveChanges()
targetFragment?.also { target ->
target.onActivityResult(targetRequestCode, PROXY_PREFERENCES_UPDATED_REQUEST_CODE, null)
}
dismiss()
}
}
}
updateSelectedProxyType()
updateEditingMode()
updateProxyPrefInfo()
updateSaveButtonVisibility(false)
return mainView
}
private fun updateSaveButtonVisibility(visible: Boolean) {
saveButtonContainer.visibility = if (visible) View.VISIBLE else View.GONE
}
private fun saveChanges() {
val proxyPref = getSelectedProxyPref()
settings.updateCurrentProxyPref(proxyPref, proxyEnableSwitcher.isChecked)
}
private fun updateProxyPrefInfo() {
val proxyPref = settings.currentProxyPref
if (proxyPref is ProxyMTProtoPref) {
mainView.findViewById<TextView>(R.id.key_text).text = proxyPref.key
} else if (proxyPref is ProxySOCKS5Pref) {
mainView.findViewById<TextView>(R.id.username_text).text = proxyPref.login
mainView.findViewById<TextView>(R.id.password_text).text = proxyPref.password
}
}
private fun getSelectedProxyPref(): ProxyPref {
val server = serverEditText.text.toString()
val port = portEditText.text.toString().toIntOrNull() ?: -1
return when (selectedProxyType) {
ProxyType.MTPROTO -> {
val key = mainView.findViewById<TextView>(R.id.key_text).text.toString()
ProxyMTProtoPref(settings.currentProxyPref.id, server, port, key)
}
ProxyType.SOCKS5 -> {
val username = mainView.findViewById<TextView>(R.id.username_text).text.toString()
val password = mainView.findViewById<TextView>(R.id.password_text).text.toString()
ProxySOCKS5Pref(settings.currentProxyPref.id, server, port, username, password)
}
}
}
private fun updateSelectedProxyType() {
view?.findViewById<ViewGroup>(R.id.proxy_type_container)?.apply {
for (i in 0 until childCount) {
getChildAt(i).apply {
findViewById<RadioButton>(R.id.radio_button).isChecked = tag == selectedProxyType
}
}
}
}
private fun updateEditingMode() {
mainView.findViewById<LinearLayout>(R.id.proxy_sosks5_container)?.visibility =
if (selectedProxyType == ProxyType.SOCKS5) View.VISIBLE else View.GONE
mainView.findViewById<LinearLayout>(R.id.proxy_mtproto_container)?.visibility =
if (selectedProxyType == ProxyType.MTPROTO) View.VISIBLE else View.GONE
}
private fun addItemToContainer(
inflater: LayoutInflater,
container: ViewGroup,
proxyTypeTag: ProxyType
) {
inflater.inflate(R.layout.item_with_rb_and_btn, container, false).apply {
findViewById<TextView>(R.id.title).text = proxyTypeTag.name
findViewById<View>(R.id.primary_btn).visibility = View.GONE
findViewById<View>(R.id.icon).visibility = View.GONE
findViewById<RadioButton>(R.id.radio_button).isChecked = selectedProxyType == proxyTypeTag
setOnClickListener {
selectedProxyType = proxyTypeTag
updateSelectedProxyType()
updateEditingMode()
updateSaveButtonVisibility(selectedProxyType != settings.currentProxyPref.type && portEditText.text.isNotEmpty() && serverEditText.text.isNotEmpty())
}
this.tag = proxyTypeTag
container.addView(this)
}
}
companion object {
private const val TAG = "ProxySettingsDialogFragment"
const val PROXY_PREFERENCES_UPDATED_REQUEST_CODE = 6
fun showInstance(fm: FragmentManager, target: Fragment): Boolean {
return try {
ProxySettingsDialogFragment().apply {
setTargetFragment(target, PROXY_PREFERENCES_UPDATED_REQUEST_CODE)
show(fm, TAG)
}
true
} catch (e: RuntimeException) {
false
}
}
}
}

56
OsmAnd-telegram/src/net/osmand/telegram/ui/SearchDialogFragment.kt
View file

@ -2,9 +2,11 @@ package net.osmand.telegram.ui
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.content.ContextCompat
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.support.v7.widget.Toolbar
@ -64,14 +66,14 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
): View {
val mainView = inflater.inflate(R.layout.fragment_search_dialog, parent)
val appBarLayout = mainView.findViewById<View>(R.id.app_bar_layout)
AndroidUtils.addStatusBarPadding19v(context!!, appBarLayout)
mainView.findViewById<Toolbar>(R.id.toolbar).apply {
navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
setNavigationOnClickListener { dismiss() }
}
val window = dialog.window
if (window != null && Build.VERSION.SDK_INT >= 21) {
window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
}
searchEditText = mainView.findViewById<EditText>(R.id.searchEditText).apply {
addTextChangedListener(object : TextWatcher {
@ -104,7 +106,11 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
addOnScrollListener(object : RecyclerView.OnScrollListener() {
override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
super.onScrollStateChanged(recyclerView, newState)
locationUiUpdateAllowed = newState == RecyclerView.SCROLL_STATE_IDLE
val scrolling = newState != RecyclerView.SCROLL_STATE_IDLE
locationUiUpdateAllowed = !scrolling
if (scrolling) {
hideKeyboard()
}
}
})
}
@ -127,6 +133,13 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
return mainView
}
private fun hideKeyboard() {
val mainActivity = activity
if (mainActivity != null && searchEditText.hasFocus()) {
AndroidUtils.hideSoftKeyboard(mainActivity, searchEditText)
}
}
private fun clearSearchedItems() {
searchedChatsIds.clear()
searchedPublicChatsIds.clear()
@ -200,7 +213,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
private fun updateLocationUi() {
if (locationUiUpdateAllowed) {
app.runInUIThread { updateList() }
app.runInUIThread { adapter.notifyDataSetChanged() }
}
}
@ -211,9 +224,28 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
val users: MutableList<TdApi.User> = mutableListOf()
val currentUserId = telegramHelper.getCurrentUserId()
searchedChatsIds.forEach {
selectedChats.forEach {
val chat = telegramHelper.getChat(it)
if (chat != null) {
if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
items.add(chat)
}
} else {
telegramHelper.requestChat(it)
}
}
selectedUsers.forEach {
val user = telegramHelper.getUser(it.toInt())
if (user != null) {
if (user.id != currentUserId)
items.add(user)
} else {
telegramHelper.requestUser(it.toInt())
}
}
searchedChatsIds.forEach {
val chat = telegramHelper.getChat(it)
if (chat != null && !selectedChats.contains(it)) {
if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
chats.add(chat)
}
@ -225,7 +257,7 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
searchedContactsIds.forEach { userId ->
val user = telegramHelper.getUser(userId)
if (user != null) {
if (user != null && !selectedUsers.contains(userId.toLong())) {
if (user.id != currentUserId && !chats.any { telegramHelper.getUserIdFromChatType(it.type) == user.id })
users.add(user)
} else {
@ -236,9 +268,8 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
searchedPublicChatsIds.forEach {
val chat = telegramHelper.getChat(it)
if (chat != null) {
if (!telegramHelper.isChannel(chat) && !chats.contains(chat)
&& telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
if (chat != null && !selectedChats.contains(it) && !searchedChatsIds.contains(it)) {
if (!telegramHelper.isChannel(chat) && telegramHelper.getUserIdFromChatType(chat.type) != currentUserId) {
publicChats.add(chat)
}
} else {
@ -370,6 +401,9 @@ class SearchDialogFragment : BaseDialogFragment(), TelegramHelper.TelegramSearch
} else {
selectedUsers.remove(itemId)
}
if (!(searchedChatsIds.contains(itemId) || searchedPublicChatsIds.contains(itemId) || searchedContactsIds.contains(itemId.toInt()))) {
updateList()
}
}
switchButtonsVisibility(selectedChats.isNotEmpty() || selectedUsers.isNotEmpty())
}

41
OsmAnd-telegram/src/net/osmand/telegram/ui/SettingsDialogFragment.kt
View file

@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Bundle
import android.support.v4.app.FragmentManager
import android.support.v4.content.ContextCompat
import android.support.v7.widget.ListPopupWindow
import android.support.v7.widget.Toolbar
import android.text.SpannableStringBuilder
@ -39,14 +40,14 @@ class SettingsDialogFragment : BaseDialogFragment() {
): View {
val mainView = inflater.inflate(R.layout.fragement_settings_dialog, parent)
val appBarLayout = mainView.findViewById<View>(R.id.app_bar_layout)
AndroidUtils.addStatusBarPadding19v(context!!, appBarLayout)
mainView.findViewById<Toolbar>(R.id.toolbar).apply {
navigationIcon = uiUtils.getThemedIcon(R.drawable.ic_arrow_back)
setNavigationOnClickListener { dismiss() }
}
val window = dialog.window
if (window != null && Build.VERSION.SDK_INT >= 21) {
window.statusBarColor = ContextCompat.getColor(app, R.color.card_bg_light)
}
var container = mainView.findViewById<ViewGroup>(R.id.gps_and_loc_container)
for (pref in settings.gpsAndLocPrefs) {
inflater.inflate(R.layout.item_with_desc_and_right_value, container, false).apply {
@ -91,6 +92,32 @@ class SettingsDialogFragment : BaseDialogFragment() {
container.addView(this)
}
container = mainView.findViewById<ViewGroup>(R.id.proxy_settings_container)
inflater.inflate(R.layout.item_with_descr_and_right_switch, container, false).apply {
findViewById<ImageView>(R.id.icon).setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_proxy))
findViewById<ImageView>(R.id.icon_right).apply {
visibility = View.VISIBLE
setImageDrawable(uiUtils.getThemedIcon(R.drawable.ic_action_additional_option))
setOnClickListener {
activity?.supportFragmentManager?.also { ProxySettingsDialogFragment.showInstance(it, this@SettingsDialogFragment) }
}
}
findViewById<TextView>(R.id.title).text = getText(R.string.proxy)
val description = findViewById<TextView>(R.id.description).apply {
text = if (settings.proxyEnabled) getText(R.string.proxy_connected) else getText(R.string.proxy_disconnected)
}
val switcher = findViewById<Switch>(R.id.switcher).apply {
isChecked = app.settings.proxyEnabled
}
setOnClickListener {
val checked = !app.settings.proxyEnabled
switcher.isChecked = checked
settings.updateProxySetting(checked)
description.text = if (checked) getText(R.string.proxy_connected) else getText(R.string.proxy_disconnected)
}
container.addView(this)
}
shareAsDescription = mainView.findViewById<TextView>(R.id.share_as_description).apply {
text = getText(R.string.share_location_as_description)
setOnClickListener {
@ -213,6 +240,12 @@ class SettingsDialogFragment : BaseDialogFragment() {
}
}
}
ProxySettingsDialogFragment.PROXY_PREFERENCES_UPDATED_REQUEST_CODE -> {
view?.findViewById<ViewGroup>(R.id.proxy_settings_container)?.apply {
findViewById<TextView>(R.id.description)?.text = if (settings.proxyEnabled) getText(R.string.proxy_connected) else getText(R.string.proxy_disconnected)
findViewById<Switch>(R.id.switcher)?.isChecked = app.settings.proxyEnabled
}
}
}
}

21
OsmAnd-telegram/src/net/osmand/telegram/utils/AndroidUtils.kt
View file

@ -106,6 +106,27 @@ object AndroidUtils {
}
}
fun getNavBarHeight(ctx: Context): Int {
if (!hasNavBar(ctx)) {
return 0
}
val landscape = ctx.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
val isSmartphone = ctx.resources.configuration.smallestScreenWidthDp < 600
if (isSmartphone && landscape) {
return 0
}
val name = if (landscape) "navigation_bar_height_landscape" else "navigation_bar_height"
val id = ctx.resources.getIdentifier(name, "dimen", "android")
return if (id > 0) {
ctx.resources.getDimensionPixelSize(id)
} else 0
}
fun hasNavBar(ctx: Context): Boolean {
val id = ctx.resources.getIdentifier("config_showNavigationBar", "bool", "android")
return id > 0 && ctx.resources.getBoolean(id)
}
fun enterToTransparentFullScreen(activity: Activity) {
if (Build.VERSION.SDK_INT >= 23) {
val window = activity.window

1
OsmAnd/assets/bundled_assets.xml
View file

@ -43,6 +43,7 @@
<asset source="voice/sl/sl_tts.js" destination="voice/sl-tts/sl_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/sv/sv_tts.js" destination="voice/sv-tts/sv_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/sw/sw_tts.js" destination="voice/sw-tts/sw_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/tr/tr_tts.js" destination="voice/tr-tts/tr_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/uk/uk_tts.js" destination="voice/uk-tts/uk_tts.js" mode="overwriteOnlyIfExists" />
<asset source="voice/zh/zh_tts.js" destination="voice/zh-tts/zh_tts.js" mode="alwaysOverwriteOrCopy" />
<asset source="voice/zh-hk/zh-hk_tts.js" destination="voice/zh-hk-tts/zh-hk_tts.js" mode="overwriteOnlyIfExists" />

1
OsmAnd/no_translate.xml
View file

@ -31,6 +31,7 @@
<string name="osm_live_annual_price">€7,99</string>
<string name="osm_live_annual_monthly_price">€2,66</string>
<string name="twitter_address">https://twitter.com/osmandapp</string>
<string name="reddit_address">https://www.reddit.com/r/OsmAnd</string>
<string name="facebook_address">https://www.facebook.com/osmandapp</string>
<string name="vk_address">https://vk.com/osmandapp</string>
<string name="default_changeset_add">Add</string>

BIN
OsmAnd/res/drawable-hdpi/ic_action_coordinates_widget.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 878 B

BIN
OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
OsmAnd/res/drawable-hdpi/widget_coordinates_latitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
OsmAnd/res/drawable-hdpi/widget_coordinates_longitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
OsmAnd/res/drawable-hdpi/widget_coordinates_utm_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
OsmAnd/res/drawable-hdpi/widget_coordinates_utm_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
OsmAnd/res/drawable-mdpi/ic_action_coordinates_widget.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 521 B

BIN
OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-mdpi/widget_coordinates_latitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,023 B

BIN
OsmAnd/res/drawable-mdpi/widget_coordinates_longitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
OsmAnd/res/drawable-mdpi/widget_coordinates_utm_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 828 B

BIN
OsmAnd/res/drawable-mdpi/widget_coordinates_utm_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 773 B

BIN
OsmAnd/res/drawable-xhdpi/ic_action_coordinates_widget.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OsmAnd/res/drawable-xhdpi/widget_coordinates_latitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
OsmAnd/res/drawable-xhdpi/widget_coordinates_longitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-xhdpi/widget_coordinates_utm_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
OsmAnd/res/drawable-xxhdpi/ic_action_coordinates_widget.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
OsmAnd/res/drawable-xxhdpi/widget_coordinates_latitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
OsmAnd/res/drawable-xxhdpi/widget_coordinates_longitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
OsmAnd/res/drawable-xxhdpi/widget_coordinates_utm_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/ic_action_coordinates_widget.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/widget_coordinates_latitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/widget_coordinates_longitude_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_day.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/widget_coordinates_utm_night.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

2
OsmAnd/res/values-be-rBY/strings.xml → OsmAnd/res/values-b+be+Latn/strings.xml
View file

@ -3021,4 +3021,4 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
<string name="rendering_attr_undefined_name">Niavyznačana</string>
<string name="routing_attr_avoid_sett_name">Pazbiahać brukavanych daroh</string>
<string name="routing_attr_avoid_sett_description">Pazbiahać brukavanych daroh</string>
</resources>
</resources>

7
OsmAnd/res/values-be/phrases.xml
View file

@ -3348,8 +3348,8 @@
<string name="poi_climbing_toprope_no">Вяроўка з вяршыні: не</string>
<string name="poi_climbing_trad_yes">Традыцыйны: так</string>
<string name="poi_climbing_trad_no">Традыцыйны: не</string>
<string name="poi_climbing_multipitch_yes">Мультыпітч: так</string>
<string name="poi_climbing_multipitch_no">Мультыпітч: так</string>
<string name="poi_climbing_multipitch_yes">Шматзонныя маршруты: так</string>
<string name="poi_climbing_multipitch_no">Шматзонныя маршруты: не</string>
<string name="poi_climbing_ice_yes">Ледзяны: так</string>
<string name="poi_climbing_ice_no">Ледзяны: не</string>
<string name="poi_climbing_mixed_yes">Змешаны: так</string>
@ -3578,4 +3578,7 @@
<string name="poi_flare">Газавы факел</string>
<string name="poi_change_delete">Выдалены аб’ект</string>
<string name="poi_health_specialty_radiotherapy_yes">Радыятэрапія</string>
<string name="poi_climbing_crag_filter">Месца для скалалажання</string>
<string name="poi_rescue_box">Выратавальная скрыня</string>
<string name="poi_climbing_crag">Так</string>
</resources>

18
OsmAnd/res/values-be/strings.xml
View file

@ -464,7 +464,7 @@
<string name="oclock">гадзін</string>
<string name="towards">у кірунку</string>
<string name="accuracy">Дакладнасць</string>
<string name="altitude">Вышыня</string>
<string name="altitude">Вышыня над узроўнем мора</string>
<string name="no_info">Інфармацыя адсутнічае</string>
<string name="direction_style_sidewise">Па накірункам свету (8 сектараў)</string>
<string name="direction_style_clockwise">Па стрэлцы гадзінніка (12 сектараў)</string>
@ -1538,7 +1538,7 @@
<string name="rendering_value__name">Прадвызначана</string>
<string name="rendering_value_highContrastRoads_name">Высокая кантрастнасць дарог</string>
<string name="specified_directiory_not_writeable">Немагчыма стварыць мапы ў вызначаным каталозе</string>
<string name="copying_osmand_file_failed">Скапіяваць файлы не атрымалася</string>
<string name="copying_osmand_file_failed">Перамясціць файлы не атрымалася</string>
<string name="storage_directory_internal_app">Унутраная памяць дадатка</string>
<string name="storage_directory_manual">Вызначана ўласнаручна</string>
<string name="storage_directory_default">Унутраная памяць</string>
@ -1546,7 +1546,7 @@
<string name="storage_directory_external">Вонкавы носьбіт інфармацыі</string>
<string name="storage_directory">Захоўванне мапы</string>
<string name="storage_directory_multiuser">Агульнае сховішча</string>
<string name="application_dir_change_warning3">Скапіяваць файлы даных OsmAnd у новае месца\?</string>
<string name="application_dir_change_warning3">Перамясціць файлы даных OsmAnd у новае месца\?</string>
<string name="rendering_attr_hideHouseNumbers_name">Нумары дамоў</string>
<string name="routing_attr_avoid_borders_description">Пазбягаць перасячэння нацыянальных межаў</string>
<string name="routing_attr_height_name">Абмежаванне па вышыні</string>
@ -3033,4 +3033,16 @@
\n
\n</string>
<string name="send_log">Адправіць журнал</string>
<string name="files_moved">Перамешчана %1$d файлаў (%2$s).</string>
<string name="files_copied">Скапіявана %1$d файлаў (%2$s).</string>
<string name="files_failed">Не атрымалася скапіяваць %1$d файлаў (%2$s).</string>
<string name="files_present">%1$d файлаў (%2$s) знаходзіцца ў папярэднім месцы \'%3$s\'.</string>
<string name="move_maps">Перамясціць мапы</string>
<string name="dont_move_maps">Не перамяшчаць</string>
<string name="public_transport_ped_route_title">Маршрут пешшу складае %1$s, дайсці можна хутчэй, чым рухацца на грамадскім транспарце</string>
<string name="public_transport_no_route_title">На жаль, OsmAnd не змог знайсці маршрут па вашых наладах.</string>
<string name="public_transport_try_ped">Паспрабуйце пешаходную навігацыю.</string>
<string name="public_transport_try_change_settings">Паспрабуйце змяніць налады.</string>
<string name="public_transport_calc_pedestrian">Падлічыць пешаходны маршрут</string>
<string name="public_transport_type">Тып транспарту</string>
</resources>

20
OsmAnd/res/values-ca/strings.xml
View file

@ -709,7 +709,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
<string name="poi_filter_public_transport">Transport públic</string>
<string name="poi_filter_emergency">Emergències</string>
<string name="poi_filter_restaurants">Restaurants</string>
<string name="osm_editing_plugin_description">"Amb aquest connector d\'OsmAnd es pot fer contribucions a OSM com la creació o modificació de PDIs d\'OSM, obrir o comentar anotacions OSM o contribuir amb fitxers GPX registrats. OSM és un projecte de cartografia global, de domini públic i gestionat per una comunitat. Per més detalls dirigiu-vos a https://openstreetmap.org. La participació activa és d\'agrair i aquestes contribucions es poden directament des OsmAnd, si heu indicat les vostres credencials personals d\'OSM a l\'aplicació."</string>
<string name="osm_editing_plugin_description">"Amb aquest connector d\'OsmAnd es poden fer contribucions a OSM com la creació o modificació de PDIs d\'OSM, obrir o comentar anotacions OSM o contribuir amb fitxers GPX enregistrats. OSM és un projecte gestionat per una comunitat, de domini públic i de cartografia global,. Per més detalls dirigiu-vos a https://openstreetmap.org. La participació activa s\'agraeix i aquestes contribucions es poden fer directament des OsmAnd, si heu indicat les vostres credencials personals d\'OSM a l\'aplicació."</string>
<string name="tts_language_not_supported">La llengua seleccionada no està suportada per el motor de TTS (text a veu) d\'Android instal·lat. Voleu buscar altres motors TTS a la botiga d\'aplicacions? Altrament s\'usarà la llengua del TTS per defecte.</string>
<string name="send_location_way_choose_title">Comparteix l\'ubicació usant</string>
<string name="old_map_index_is_not_supported">Format de mapa «{0}» obsolet, no s\'admet</string>
@ -1551,9 +1551,9 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="index_name_netherlands">Europa - Països Baixos</string>
<string name="rendering_value__name">Per defecte</string>
<string name="rendering_value_highContrastRoads_name">Vies més contrastades</string>
<string name="application_dir_change_warning3">Voleu copiar els fitxers de dades OsmAnd a la nova destinació?</string>
<string name="application_dir_change_warning3">Voleu moure els fitxers de dades OsmAnd a la nova destinació\?</string>
<string name="specified_directiory_not_writeable">Creació de mapes al directori indicat fallida</string>
<string name="copying_osmand_file_failed">Error en copiar fitxers</string>
<string name="copying_osmand_file_failed">Error en moure els fitxers</string>
<string name="storage_directory_external">Emmagatzematge exterior</string>
<string name="storage_directory_multiuser">Emmagatzematge multiusuari</string>
<string name="storage_directory_internal_app">Memòria interna de l\'aplicació</string>
@ -3021,7 +3021,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="quick_action_day_night_mode">Mode %s</string>
<string name="shared_string_degrees">Graus</string>
<string name="shared_string_milliradians">Mil·liradiants</string>
<string name="angular_measeurement">Unitats de mesura angular</string>
<string name="angular_measeurement">Unitat angular</string>
<string name="angular_measeurement_descr">Canvia la unitat de mesura de l\'azimut.</string>
<string name="routing_attr_avoid_sett_name">Evita els empedrats i els llambordins</string>
<string name="routing_attr_avoid_sett_description">Evita els empedrats i els llambordins</string>
@ -3046,4 +3046,16 @@ Abasta l\'àrea: %1$s x %2$s</string>
\n• Mostra l\'azimut en la mesura de la distància
\n</string>
<string name="send_log">Envia el registre</string>
<string name="files_moved">S\'han mogut %1$d arxius (%2$s).</string>
<string name="files_copied">S\'han copiat %1$d arxius (%2$s).</string>
<string name="files_failed">No ha pogut copiar %1$d arxius (%2$s).</string>
<string name="files_present">Ja hi ha %1$d arxius (%2$s) a la localització prèvia \'%3$s\'.</string>
<string name="move_maps">Mou els mapes</string>
<string name="dont_move_maps">No moguis</string>
<string name="public_transport_ped_route_title">La ruta a peu triga aproximadament %1$s i podria ser més ràpida utilitzant transport públic</string>
<string name="public_transport_no_route_title">Per desgràcia, OsmAnd no ha pogut trobar una ruta adient amb els vostres paràmetres.</string>
<string name="public_transport_try_ped">Proveu la navegació per vianants.</string>
<string name="public_transport_try_change_settings">Proveu a canviar els paràmetres.</string>
<string name="public_transport_calc_pedestrian">Calcula la ruta per vianants</string>
<string name="public_transport_type">Tipus de transport</string>
</resources>

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

@ -662,7 +662,7 @@
\nVšechny tyto mapy mohou být použity jako hlavní (základní) mapa na obrazovce OsmAnd nebo jako překryvná popř. podkladová mapa k jiné základní mapě (např. standardní OsmAnd off-line mapě). Pro zlepšení viditelnosti podkladových map je možné vypnout některé objekty z vektorových map OsmAnd, přes menu \'Nastavení mapy\'.
\n
\nDlaždicové mapy můžete získat přímo z on-line zdrojů nebo si je můžete připravit pro off-line použití (zkopírovat ručně do datového adresáře OsmAnd) jako SQLite databázi, která může být vytvořena mnoha programy pro přípravu map.</string>
<string name="osmand_background_plugin_description">Zobrazení nastavení pro zapnutí záznamu trasy a navigace na pozadí s pravidelným probouzením GPS zařízení (s vypnutou obrazovkou).</string>
<string name="osmand_background_plugin_description">Zobrazí nastavení pro zapnutí záznamu trasy a navigace na pozadí s pravidelným probouzením GPS zařízení (s vypnutou obrazovkou).</string>
<string name="osmand_accessibility_description">Tento modul zobrazí nastavení pro speciální funkce ulehčení přístupu přímo v OsmAnd. Například je možné měnit rychlost TTS hlasu, použít trackball na přibližování nebo například použít hlasové předčítání pro oznamování polohy.</string>
<string name="osmand_development_plugin_description">Tento modul zobrazí nastavení vývojových a ladících funkcí, jako jsou simulace navigace, informace o rychlosti vykreslování nebo hlasová oznámení. Tato nastavení jsou určené pro vývojáře a nejsou potřebné pro běžné použití.</string>
<string name="plugins_screen">Správce modulů</string>
@ -2873,7 +2873,7 @@ Zobrazená oblast: %1$s x %2$s</string>
<string name="points_of_interests">Body zájmu (POI)</string>
<string name="waiting_for_route_calculation">Vypočítávání trasy…</string>
<string name="app_mode_public_transport">Veřejná doprava</string>
<string name="avoid_roads_descr">Vyberte cestu na mapě nebo ze seznamu níže, které se chcete během navigace vyhnout:</string>
<string name="avoid_roads_descr">Vyberte na mapě nebo ze seznamu níže cestu, které se chcete během navigace vyhnout:</string>
<string name="show_along_the_route">Ukázat podél trasy</string>
<string name="simulate_navigation">Simulovat navigaci</string>
<string name="choose_track_file_to_follow">Vyberte soubor s trasou, kterou chcete následovat</string>

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

@ -3588,4 +3588,5 @@
<string name="poi_health_specialty_radiotherapy_yes">Strålebehandling</string>
<string name="poi_rescue_box">Redningsboks</string>
<string name="poi_climbing_crag">Ja</string>
<string name="reddit">Reddit</string>
</resources>

32
OsmAnd/res/values-da/strings.xml
View file

@ -1547,7 +1547,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
<string name="rendering_value__name">Standard</string>
<string name="rendering_value_highContrastRoads_name">Veje med høj kontrast</string>
<string name="specified_directiory_not_writeable">Kunne ikke oprettes kort i det angivne bibliotek</string>
<string name="copying_osmand_file_failed">Kopiering af filer mislykkedes</string>
<string name="copying_osmand_file_failed">Flytning af filer mislykkedes</string>
<string name="storage_directory_external">Ekstern lager</string>
<string name="storage_directory_multiuser">Flerbruger lager</string>
<string name="storage_directory_internal_app">Intern programhukommelse</string>
@ -1555,7 +1555,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
<string name="storage_directory_default">Internhukommelse</string>
<string name="storage_directory">Kortlagring</string>
<string name="shared_string_copy">Kopier</string>
<string name="application_dir_change_warning3">Kopier datafilerne til den nye placering?</string>
<string name="application_dir_change_warning3">Flyt datafilerne til den nye placering\?</string>
<string name="rendering_attr_hideHouseNumbers_name">Husnumre</string>
<string name="routing_attr_avoid_borders_description">Undgå at krydse landegrænser</string>
<string name="routing_attr_height_name">Højdegrænse</string>
@ -2675,7 +2675,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="all_data">Alle data</string>
<string name="osm_notes">OSM-noter</string>
<string name="tunnel_warning">Tunnel forude</string>
<string name="show_tunnels">"Tunneler "</string>
<string name="show_tunnels">Tunneler</string>
<string name="shared_string_current">Nuværende</string>
<string name="last_intermediate_dest_description">Tilføjer et mellemliggende stop</string>
<string name="first_intermediate_dest_description">Tilføjer første stop</string>
@ -3024,12 +3024,26 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="routing_attr_avoid_subway_description">Undgå metro og lettog</string>
<string name="routing_attr_avoid_ferry_name">Undgå færger</string>
<string name="routing_attr_avoid_ferry_description">Undgå færger</string>
<string name="release_3_3_7">• Vis tid mellem overførsler i offentlig transport
<string name="release_3_3_7">• Vis tid mellem overførsler i offentlig transport
\n
\n • Korrigeret brugergrænseflade til ruteoplysningerne
\n
\n • Rettet mørkt tema i Retningsmenuen og Rutedetaljer
\n
\n • Vis azimut i Mål afstand
\n
\n • Korrigeret brugergrænseflade til ruteoplysningerne
\n
\n • Rettet mørkt tema i Retningsmenuen og Rutedetaljer
\n
\n • Vis azimut i mål afstand</string>
\n</string>
<string name="send_log">Send log</string>
<string name="files_moved">Flyttede %1$d filer (%2$s).</string>
<string name="files_copied">Kopieret %1$d filer (%2$s).</string>
<string name="files_failed">Kunne ikke kopiere %1$d filer (%2$s).</string>
<string name="files_present">%1$d filer (%2$s) er til stede på tidligere placering \'%3$s\'.</string>
<string name="move_maps">Flyt kort</string>
<string name="dont_move_maps">Flyt ikke</string>
<string name="public_transport_ped_route_title">Ruten til fods er ca %1$s og den kunne være hurtigere end offentlig transport</string>
<string name="public_transport_no_route_title">Kunne desværre ikke finde en rute, der passer til indstillingerne.</string>
<string name="public_transport_try_ped">Prøv fodgængernavigationen.</string>
<string name="public_transport_try_change_settings">Prøv at ændre indstillinger.</string>
<string name="public_transport_calc_pedestrian">Beregn fodgængerruten</string>
<string name="public_transport_type">Transporttype</string>
</resources>

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

@ -75,7 +75,7 @@
<string name="poi_craft_boatbuilder">Schiffsbauer</string>
<string name="poi_boatyard">Schiffsanlegeplatz</string>
<string name="poi_craft_bookbinder">Buchbinder</string>
<string name="poi_bookmaker">Buchmacher</string>
<string name="poi_bookmaker">Wettbüro</string>
<string name="poi_books">Buchhandlung</string>
<string name="poi_border_control">Grenzkontrolle</string>
<string name="poi_boules">Boule</string>
@ -433,7 +433,7 @@
<string name="poi_seafood">Fischgeschäft</string>
<string name="poi_anchor_berth">Ankerplatz</string>
<string name="poi_anchorage">Ankerplatz</string>
<string name="poi_beacon">Bake (Seezeichen)</string>
<string name="poi_beacon">Bake</string>
<string name="poi_beacon_cardinal">Untiefenbake (Kardinal)</string>
<string name="poi_beacon_lateral">Fahrrinnenbake (Lateral)</string>
<string name="poi_beacon_safe_water">Mitte-Fahrwasser-Bake</string>
@ -3202,7 +3202,7 @@
<string name="poi_gorge">Schlucht</string>
<string name="poi_couloir">Felsschlucht</string>
<string name="poi_mountain_area">Berggebiet</string>
<string name="poi_surface_clay">Sand</string>
<string name="poi_surface_clay">Asche</string>
<string name="poi_surface_tartan">Tartan</string>
<string name="poi_surface_artificial_turf">Kunstrasen</string>
<string name="poi_surface_decoturf">Zierrasen</string>
@ -3534,7 +3534,7 @@
<string name="poi_substation_valve">Ventil</string>
<string name="poi_substation_valve_group">Ventilgruppe</string>
<string name="poi_substation_field_gathering">Feldleitung</string>
<string name="poi_pipeline_substation">Pipeline-Umspannwerk</string>
<string name="poi_pipeline_substation">Pipeline-Verteiler</string>
<string name="poi_substation_inspection_gauge">Kontrollmanometer</string>
<string name="poi_craft_confectionery">Süßwarenproduktion</string>
<string name="poi_shop_wholesale">Großhandel</string>
@ -3584,4 +3584,5 @@
<string name="poi_climbing_crag_filter">Kletterfelsen</string>
<string name="poi_rescue_box">Rettungskasten</string>
<string name="poi_climbing_crag">Ja</string>
<string name="reddit">Reddit</string>
</resources>

34
OsmAnd/res/values-de/strings.xml
View file

@ -1513,9 +1513,9 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).</string
<string name="shared_string_selected_lowercase">ausgewählt</string>
<string name="shared_string_is_open">Jetzt offen</string>
<string name="rendering_attr_hideHouseNumbers_name">Hausnummern</string>
<string name="application_dir_change_warning3">OsmAnd-Daten an den neuen Ort kopieren?</string>
<string name="application_dir_change_warning3">OsmAnd-Dateien an den neuen Ort verschieben\?</string>
<string name="specified_directiory_not_writeable">Karten konnten im angegebenen Verzeichnis nicht erstellt werden</string>
<string name="copying_osmand_file_failed">Das Kopieren der Dateien ist fehlgeschlagen!</string>
<string name="copying_osmand_file_failed">Das Verschieben von Dateien ist fehlgeschlagen</string>
<string name="storage_directory_external">Externer Speicher</string>
<string name="storage_directory_multiuser">Mehrbenutzer-Speicher</string>
<string name="storage_directory_internal_app">Interner App-speicher</string>
@ -3013,12 +3013,12 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="routing_attr_avoid_sett_description">Vermeiden Sie Kopfsteinpflaster und Pflastersteine</string>
<string name="shared_string_degrees">Grad</string>
<string name="shared_string_milliradians">Milliradiant</string>
<string name="angular_measeurement">Winkel-Maßeinheiten</string>
<string name="angular_measeurement">Winkeleinheit</string>
<string name="angular_measeurement_descr">Ändern, in welchem Azimut gemessen wird.</string>
<string name="routing_attr_avoid_tram_name">Straßenbahnen meiden</string>
<string name="routing_attr_avoid_tram_description">Straßenbahnen meiden</string>
<string name="routing_attr_avoid_bus_name">Busse meiden</string>
<string name="routing_attr_avoid_bus_description">Busse und Trolleybusse meiden</string>
<string name="routing_attr_avoid_bus_description">Busse und Oberleitungsbusse meiden</string>
<string name="routing_attr_avoid_share_taxi_name">Sammeltaxi meiden</string>
<string name="routing_attr_avoid_share_taxi_description">Sammeltaxi meiden</string>
<string name="routing_attr_avoid_train_name">Züge meiden</string>
@ -3027,14 +3027,26 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="routing_attr_avoid_subway_description">U-Bahnen und leichten Schienenverkehr meiden</string>
<string name="routing_attr_avoid_ferry_name">Fähren meiden</string>
<string name="routing_attr_avoid_ferry_description">Fähren meiden</string>
<string name="release_3_3_7">• Anzeige der Zeit zwischen den Umsteigen in öffentlichen Verkehrsmitteln
\n
\n• Korrigierte Benutzeroberfläche für die Routendetails korrigiert
\n
\n• Das dunkle Thema im Richtungsmenü und in den Routendetails wurde korrigiert.
\n
<string name="release_3_3_7">• Anzeige der Zeit zwischen den Umsteigen in öffentlichen Verkehrsmitteln
\n
\n• Korrigierte Benutzeroberfläche für die Routendetails
\n
\n• Das dunkle Thema im Richtungsmenü und in den Routendetails wurde korrigiert.
\n
\n• Azimut in der Maßeinheit Distanz anzeigen
\n
\n</string>
<string name="send_log">Sendeprotokoll</string>
<string name="send_log">Log senden</string>
<string name="files_copied">Kopierte %1$d Dateien (%2$s).</string>
<string name="files_failed">Es konnten keine %1$d Dateien (%2$s) kopiert werden.</string>
<string name="public_transport_try_ped">Probieren Sie die Fußgängernavigation aus.</string>
<string name="public_transport_try_change_settings">Versuchen Sie, die Einstellungen zu ändern.</string>
<string name="public_transport_calc_pedestrian">Fußgängerroute berechnen</string>
<string name="public_transport_type">Transportart</string>
<string name="files_moved">%1$d Dateien verschoben (%2$s).</string>
<string name="files_present">%1$d Dateien (%2$s) sind am vorherigen Ort \'%3$s\' vorhanden.</string>
<string name="move_maps">Karten verschieben</string>
<string name="dont_move_maps">Nicht bewegen</string>
<string name="public_transport_ped_route_title">Die Route beträgt ca. %1$s und könnte zu Fuß schneller sein als mit öffentlichen Verkehrsmitteln</string>
<string name="public_transport_no_route_title">Leider konnte OsmAnd keine für Ihre Einstellungen geeignete Route finden.</string>
</resources>

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

File diff suppressed because it is too large Load diff

45
OsmAnd/res/values-eo/phrases.xml
View file

@ -75,12 +75,12 @@
<string name="poi_bag">Sak-vendejo</string>
<string name="poi_bathroom_furnishing">Lavĉambr-akcesoraĵa vendejo</string>
<string name="poi_bed">Litaĵ-vendejo</string>
<string name="poi_boutique">Galanteriejo</string>
<string name="poi_boutique">Mod‑butiko</string>
<string name="poi_camera">Fotiloj-k-lensoj vendejo</string>
<string name="poi_carpet">Tapiŝ-vendejo</string>
<string name="poi_chemist">Purigaĵ-vendejo</string>
<string name="poi_charity">Almoza vendejo</string>
<string name="poi_clothes">Vest-vendejo</string>
<string name="poi_clothes">Vest‑vendejo</string>
<string name="poi_clothes_children">infanaj</string>
<string name="poi_shoes">Ŝu-vendejo</string>
<string name="poi_candles">Kandel-vendejo</string>
@ -124,7 +124,7 @@
<string name="poi_doityourself">Memfaradil-vendejo</string>
<string name="poi_doors">Pord-vendejo</string>
<string name="poi_erotic">Seksumil-vendejo</string>
<string name="poi_fashion">Mod-butiko</string>
<string name="poi_fashion">Vest‑vendejo</string>
<string name="poi_fishing">Fiŝkaptil-vendejo</string>
<string name="poi_florist">Florvendejo</string>
<string name="poi_frame">Kadroj-de-pentraĵoj-vendejo</string>
@ -344,7 +344,7 @@
<string name="poi_geyser">Gejsero</string>
<string name="poi_club_linux">Linuksa klubejo</string>
<string name="poi_glacier">Glaciejo</string>
<string name="poi_stone">Roko</string>
<string name="poi_stone">Ŝtonego</string>
<string name="poi_aerialway_station">Kablovoja stacio</string>
<string name="poi_aerialway_cable_car">Telfero unu-vagoneta (ir-reira)</string>
<string name="poi_aerialway_chair_lift">Telfero seĝa</string>
@ -829,7 +829,7 @@
<string name="poi_food_court">Manĝobazaro</string>
<string name="poi_drinking_water">Trinkakvejo</string>
<string name="poi_barbecue">Rostilo</string>
<string name="poi_craft_agricultural_engines">Oficejo de isto de agrokulturaj maŝinoj</string>
<string name="poi_craft_agricultural_engines">Laborejo de agrokulturaj maŝinoj</string>
<string name="poi_craft_basket_maker">Korb-laborejo</string>
<string name="poi_craft_beekeeper">Abelistejo</string>
<string name="poi_craft_blacksmith">Forĝejo</string>
@ -923,7 +923,7 @@
<string name="poi_strait">Markolo</string>
<string name="poi_anchorage">Rodo (regiono)</string>
<string name="poi_anchor_berth">Rodo (preciza ankrejo)</string>
<string name="poi_beacon">Buo fiksa</string>
<string name="poi_beacon">Signalilo</string>
<string name="poi_beacon_cardinal">Buo fiksa: ĉefa (mondflanka)</string>
<string name="poi_beacon_lateral">Buo fiksa: flanka (latera)</string>
<string name="poi_beacon_safe_water">Buo fiksa: sekurakva</string>
@ -2195,11 +2195,11 @@
<string name="poi_bridge_ref">Referenco de ponto</string>
<string name="poi_tunnel_ref">Referenco de tunelo</string>
<string name="poi_ref">Referenco</string>
<string name="poi_cargo_passengers">Pasaĝeroj</string>
<string name="poi_cargo_vehicle">Veturiloj</string>
<string name="poi_cargo_bicycle">Bicikloj</string>
<string name="poi_cargo_container">Transportujoj</string>
<string name="poi_cargo_hgv">Kamionoj</string>
<string name="poi_cargo_passengers">pasaĝeroj</string>
<string name="poi_cargo_vehicle">veturiloj</string>
<string name="poi_cargo_bicycle">bicikloj</string>
<string name="poi_cargo_container">transportujoj</string>
<string name="poi_cargo_hgv">kamionoj</string>
<string name="poi_wiki_lang_als">Vikipedio Alemana</string>
<string name="poi_wiki_lang_az">Vikipedio Azerbajĝana</string>
<string name="poi_wiki_lang_bn">Vikipedio Bengala</string>
@ -2413,7 +2413,7 @@
<string name="poi_health_service_support_no">San-servo: apogo psika: ne</string>
<string name="poi_health_service_test_yes">San-servo: testoj: jes</string>
<string name="poi_health_service_test_no">San-servo: testoj: ne</string>
<string name="poi_health_facility_type_office">San-servejo: kabineto de kuracisto</string>
<string name="poi_health_facility_type_office">Kabineto de kuracisto</string>
<string name="poi_health_facility_type_field_hospital">San-servejo: kampa malsanulejo</string>
<string name="poi_fire_hydrant_diameter">Diametro de hidranto</string>
<string name="poi_fire_hydrant_pressure">Premo de hidranto</string>
@ -2573,13 +2573,13 @@
<string name="poi_aquaculture_fish">Akvokulturo: fiŝoj</string>
<string name="poi_aquaculture_mussels">Akvokulturo: moluskoj</string>
<string name="poi_mdf">Telefon-diskonektig-stacio</string>
<string name="poi_diplomatic_consulate">Konsulejo</string>
<string name="poi_diplomatic_consulate_general">Konsulejo ĝenerala</string>
<string name="poi_diplomatic_honorary_consulate">Konsulejo honora</string>
<string name="poi_diplomatic_permanent_mission">Oficejo de misio diplomatia</string>
<string name="poi_diplomatic_delegation">Oficejo de delegitaro (EU)</string>
<string name="poi_diplomatic_ambassadors_residence">Ambasadestrejo</string>
<string name="poi_diplomatic_high_commission">Oficejo de alta komisaro</string>
<string name="poi_diplomatic_consulate">konsulejo</string>
<string name="poi_diplomatic_consulate_general">konsulejo ĝenerala</string>
<string name="poi_diplomatic_honorary_consulate">konsulejo honora</string>
<string name="poi_diplomatic_permanent_mission">oficejo de misio diplomatia</string>
<string name="poi_diplomatic_delegation">oficejo de delegitaro (EU)</string>
<string name="poi_diplomatic_ambassadors_residence">ambasadestrejo</string>
<string name="poi_diplomatic_high_commission">oficejo de alta komisaro</string>
<string name="poi_diaper_table_count">Tabloj por tra-vindotuk-ado</string>
<string name="poi_fire_operator">Administranto kontraŭfajrega</string>
<string name="poi_toilets_disposal_flush">Necesej-speco: akvoŝpruca</string>
@ -2778,7 +2778,7 @@
<string name="poi_parking_type">Speco de parkumejo</string>
<string name="poi_covered">Kovrita</string>
<string name="poi_subway_station_filter">Metroa stacio</string>
<string name="poi_ferry_terminal_cargo">Portaĵo de</string>
<string name="poi_ferry_terminal_cargo">Transporto de</string>
<string name="poi_bicycle_parking_type">Speco de bicikl‑parkumejo</string>
<string name="poi_aerialway_bicycle">Transportado de bicikloj</string>
<string name="poi_aerialway_heating">Hejtado</string>
@ -2786,7 +2786,7 @@
<string name="poi_observatory_designation">Apliko</string>
<string name="poi_telescope_type">Speco</string>
<string name="poi_animal_training_type">Dresado de</string>
<string name="poi_embassy_type">Speco</string>
<string name="poi_embassy_type">Speco de diplomata oficejo</string>
<string name="poi_city_capital">Ĉefurbo</string>
<string name="poi_pharmacy_dispensing">Medikamentoj je preskribo</string>
<string name="poi_healthcare_alternative_types">Kontraŭmedicino</string>
@ -3323,7 +3323,7 @@
<string name="poi_map_size_city">Grando de mapo: urba</string>
<string name="poi_map_size_region">Grando de mapo: regiona</string>
<string name="poi_charging_station">Ŝargostacio</string>
<string name="poi_depot">Aŭtobusejo/tramejo</string>
<string name="poi_depot">Remizo</string>
<string name="poi_letter_box">Leterkesto</string>
<string name="poi_post_street">Strato</string>
<string name="poi_post_housenumber">Numero de domo</string>
@ -3574,4 +3574,5 @@
<string name="poi_climbing_crag_filter">Areo de grimpado</string>
<string name="poi_rescue_box">Tujhelpilo (ensovaĝe)</string>
<string name="poi_climbing_crag">jes</string>
<string name="reddit">Reddit</string>
</resources>

20
OsmAnd/res/values-eo/strings.xml
View file

@ -312,9 +312,9 @@
<string name="rendering_value_walkingRoutesOSMC_name">Kolorigi laŭ OSMC piedirada simbolo</string>
<string name="shared_string_logoff">Elsaluti</string>
<string name="rendering_attr_hideHouseNumbers_name">Numeroj de domoj</string>
<string name="application_dir_change_warning3">Ĉu kopii dosierojn de OsmAnd-datumoj al la nova loko?</string>
<string name="application_dir_change_warning3">Ĉu movi dosierojn de OsmAnd-datumoj al la nova loko\?</string>
<string name="specified_directiory_not_writeable">Ne povas krei mapojn en la difina dosierujo</string>
<string name="copying_osmand_file_failed">Kopiado de dosieroj malsukcesis</string>
<string name="copying_osmand_file_failed">Fiaskis movi dosierojn</string>
<string name="storage_directory_external">Ekstera konservejo</string>
<string name="storage_directory_multiuser">Pluruzanta konservejo</string>
<string name="storage_directory_internal_app">Interna aplikaĵa konservejo</string>
@ -1533,7 +1533,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB).</string>
<string name="search_offline_geo_error">Ne povas interpreti “%s”.</string>
<string name="search_osm_offline">Serĉi per pozici-trova servo</string>
<string name="preferred_locale_descr">Elekti lingvon de fasado (bonvolu restarti OsmAnd post ŝanĝo).</string>
<string name="unit_of_length">Long-unuoj</string>
<string name="unit_of_length">Unuoj de longo</string>
<string name="unit_of_length_descr">Ŝanĝi unuon por reprezenti distancoj.</string>
<string name="si_mi_feet">Mejloj/futoj</string>
<string name="si_mi_yard">Mejloj/jardoj</string>
@ -2987,7 +2987,7 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="quick_action_day_night_mode">%s reĝimo</string>
<string name="shared_string_degrees">Gradoj</string>
<string name="shared_string_milliradians">Miliradianoj</string>
<string name="angular_measeurement">Mezurunuo de anguloj</string>
<string name="angular_measeurement">Unuo de anguloj</string>
<string name="angular_measeurement_descr">Elekti mezurunuon por azimuto.</string>
<string name="routing_attr_avoid_sett_name">Eviti malglatan ŝtonpavimon</string>
<string name="routing_attr_avoid_sett_description">Eviti rulŝtonajn kahelojn kaj kvadratajn ŝtonojn</string>
@ -3012,4 +3012,16 @@ Indikas lokon: %1$s x %2$s"</string>
\n• montri azimuton ĉe distanc‑mezurilo
\n</string>
<string name="send_log">Sendi erar‑protokolon</string>
<string name="files_moved">Movis %1$d dosierojn (%2$s).</string>
<string name="files_copied">Kopiis %1$d dosierojn (%2$s).</string>
<string name="files_failed">Fiaskis kopii %1$d dosierojn (%2$s).</string>
<string name="files_present">%1$d dosieroj (%2$s) estas en la antaŭa loko: %3$s.</string>
<string name="move_maps">Movi mapojn</string>
<string name="dont_move_maps">Ne movi</string>
<string name="public_transport_ped_route_title">Tiu ĉi kurso perpiede estas proksimume %1$s kaj povas esti pli rapida ol per publika transporto</string>
<string name="public_transport_no_route_title">Bedaŭrinde OsmAnd ne povis kalkuli kurson laŭ viaj agordoj.</string>
<string name="public_transport_try_ped">Provu piedirantan navigadon.</string>
<string name="public_transport_try_change_settings">Provu ŝanĝi agordojn.</string>
<string name="public_transport_calc_pedestrian">Kalkuli piedirantan kurson</string>
<string name="public_transport_type">Speco de transporto</string>
</resources>

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

@ -663,7 +663,7 @@
<string name="poi_money_lender">Prestamista</string>
<string name="poi_pawnbroker">Casa de empeños;Prestamista</string>
<string name="poi_bureau_de_change">Casa de cambio</string>
<string name="poi_accountant">Contador</string>
<string name="poi_accountant">Estudio contable;Contador</string>
<string name="poi_bitcoin_yes">Pago de Bitcoin</string>
<string name="poi_cave_entrance">Entrada a cueva</string>
<string name="poi_peak">Pico de montaña</string>
@ -1494,9 +1494,9 @@
<string name="poi_takeaway_yes">Comida para llevar: sí</string>
<string name="poi_takeaway_no">Comida para llevar: no</string>
<string name="poi_takeaway_only">Comida para llevar: únicamente</string>
<string name="poi_delivery_no">Servicio a domicilio: no</string>
<string name="poi_delivery_yes">Servicio a domicilio: sí</string>
<string name="poi_delivery_only">Servicio a domicilio: únicamente</string>
<string name="poi_delivery_no">Envío a domicilio: no</string>
<string name="poi_delivery_yes">Envío a domicilio: sí</string>
<string name="poi_delivery_only">Envío a domicilio: únicamente</string>
<string name="poi_outdoor_seating_yes">Asientos exteriores: sí</string>
<string name="poi_outdoor_seating_no">Asientos exteriores: no</string>
<string name="poi_outdoor_seating_terrace">Asientos exteriores: terraza</string>
@ -2827,7 +2827,7 @@
<string name="poi_theatre_genre">Género</string>
<string name="poi_outdoor_seating">Asientos exteriores</string>
<string name="poi_smoking">Permitido fumar</string>
<string name="poi_delivery">Servicio a domicilio;Delivery</string>
<string name="poi_delivery">Envío a domicilio;Delivery</string>
<string name="poi_drive_in">Conducir por dentro</string>
<string name="poi_drive_through">Servicio en el automóvil</string>
<string name="poi_takeaway">Comida para llevar</string>
@ -3588,4 +3588,5 @@
<string name="poi_climbing_crag_filter">Peñón de escalada</string>
<string name="poi_rescue_box">Caja de rescate</string>
<string name="poi_climbing_crag">Sí</string>
<string name="reddit">Reddit</string>
</resources>

30
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
<string name="copying_osmand_file_failed">Falló al copiar archivos</string>
<string name="copying_osmand_file_failed">Fallo al mover archivos</string>
<string name="storage_directory_external">Almacenamiento externo</string>
<string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
<string name="specified_directiory_not_writeable">No se pueden crear mapas en el directorio indicado</string>
@ -30,7 +30,7 @@
<string name="mark_to_delete">Marcar para borrar</string>
<string name="local_osm_changes_upload_all_confirm">¿Subir %1$d cambio(s) a OSM?</string>
<string name="confirmation_to_clear_history">¿Limpiar el historial?</string>
<string name="application_dir_change_warning3">¿Copiar los archivos de datos de OsmAnd al nuevo destino?</string>
<string name="application_dir_change_warning3">¿Mover los archivos de datos de OsmAnd al nuevo destino\?</string>
<string name="storage_directory">Almacenamiento del mapa</string>
<string name="shared_string_places">Lugares</string>
<string name="delay_to_start_navigation_descr">Indica el tiempo de espera para permanecer en la pantalla de planificación de ruta.</string>
@ -1775,7 +1775,7 @@ Lon %2$s</string>
<string name="context_menu_item_open_note">Abrir nota de OSM</string>
<string name="osm_edit_reopened_note">Nota de OSM reabierta</string>
<string name="osm_edit_commented_note">Nota de OSM comentada</string>
<string name="osm_edit_removed_note">Nota de OSM borrada</string>
<string name="osm_edit_removed_note">Nota de OSM resuelta</string>
<string name="osm_edit_created_note">Nota de OSM creada</string>
<string name="osn_bug_name">Nota de OSM</string>
<string name="osn_add_dialog_title">Crear nota</string>
@ -3002,19 +3002,19 @@ Lon %2$s</string>
<string name="avoid_pt_types_descr">Marca los tipos de transporte público a evitar para la navegación:</string>
<string name="avoid_pt_types">Evitar tipos de transporte…</string>
<string name="quick_action_day_night_mode">modo %s</string>
<string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquín</string>
<string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquinado</string>
<string name="routing_attr_avoid_sett_description">Evita las calles empedradas y adoquinadas</string>
<string name="shared_string_degrees">Grados</string>
<string name="shared_string_milliradians">Mil angular</string>
<string name="angular_measeurement">Unidades de medición angular</string>
<string name="angular_measeurement">Unidad angular</string>
<string name="angular_measeurement_descr">Cambiar el acimut en el que se mide.</string>
<string name="routing_attr_avoid_tram_name">Evitar los tranvías</string>
<string name="routing_attr_avoid_tram_name">Evitar tranvías</string>
<string name="routing_attr_avoid_tram_description">Evita usar los tranvías</string>
<string name="routing_attr_avoid_bus_name">Evitar los colectivos</string>
<string name="routing_attr_avoid_bus_name">Evitar colectivos</string>
<string name="routing_attr_avoid_bus_description">Evita usar los colectivos y trolebuses</string>
<string name="routing_attr_avoid_share_taxi_name">Evitar los taxis colectivos</string>
<string name="routing_attr_avoid_share_taxi_name">Evitar taxis colectivos</string>
<string name="routing_attr_avoid_share_taxi_description">Evita usar los taxis colectivos</string>
<string name="routing_attr_avoid_train_name">Evitar los trenes</string>
<string name="routing_attr_avoid_train_name">Evitar trenes</string>
<string name="routing_attr_avoid_train_description">Evita usar los trenes</string>
<string name="routing_attr_avoid_subway_name">Evitar subterráneos</string>
<string name="routing_attr_avoid_subway_description">Evita usar los subterráneos y trenes ligeros</string>
@ -3029,4 +3029,16 @@ Lon %2$s</string>
\n• Visualización de medida «azimut» en «Medir distancia»
\n</string>
<string name="send_log">Enviar registro del problema</string>
<string name="files_moved">Se movieron %1$d archivos (%2$s).</string>
<string name="files_copied">Se copiaron %1$d archivos (%2$s).</string>
<string name="files_failed">Error al copiar %1$d archivo(s) (%2$s).</string>
<string name="files_present">Existen %1$d archivo(s) (%2$s) en la ubicación anterior «%3$s».</string>
<string name="move_maps">Mover mapas</string>
<string name="dont_move_maps">No mover</string>
<string name="public_transport_ped_route_title">La ruta a pie es de aproximadamente %1$s y podría ser más rápida que en transporte público</string>
<string name="public_transport_no_route_title">Por desgracia, OsmAnd no pudo encontrar una ruta adecuada a sus ajustes.</string>
<string name="public_transport_try_ped">Prueba la navegación a pie.</string>
<string name="public_transport_try_change_settings">Intenta cambiar los ajustes.</string>
<string name="public_transport_calc_pedestrian">Calcular la ruta a pie</string>
<string name="public_transport_type">Tipo de transporte</string>
</resources>

11
OsmAnd/res/values-es-rUS/phrases.xml
View file

@ -663,7 +663,7 @@
<string name="poi_money_lender">Prestamista</string>
<string name="poi_pawnbroker">Casa de empeños;Prestamista</string>
<string name="poi_bureau_de_change">Casa de cambio</string>
<string name="poi_accountant">Contador;Contable</string>
<string name="poi_accountant">Estudio contable;Contador</string>
<string name="poi_bitcoin_yes">Pago de Bitcoin</string>
<string name="poi_cave_entrance">Entrada a cueva</string>
<string name="poi_peak">Pico de montaña</string>
@ -1494,9 +1494,9 @@
<string name="poi_takeaway_yes">Comida para llevar: sí</string>
<string name="poi_takeaway_no">Comida para llevar: no</string>
<string name="poi_takeaway_only">Comida para llevar: únicamente</string>
<string name="poi_delivery_no">Servicio a domicilio: no</string>
<string name="poi_delivery_yes">Servicio a domicilio: sí</string>
<string name="poi_delivery_only">Servicio a domicilio: únicamente</string>
<string name="poi_delivery_no">Envío a domicilio: no</string>
<string name="poi_delivery_yes">Envío a domicilio: sí</string>
<string name="poi_delivery_only">Envío a domicilio: únicamente</string>
<string name="poi_outdoor_seating_yes">Asientos exteriores: sí</string>
<string name="poi_outdoor_seating_no">Asientos exteriores: no</string>
<string name="poi_outdoor_seating_terrace">Asientos exteriores: terraza</string>
@ -2826,7 +2826,7 @@
<string name="poi_outdoor_seating">Asientos exteriores</string>
<string name="poi_fee">Tarifado</string>
<string name="poi_smoking">Permitido fumar</string>
<string name="poi_delivery">Servicio a domicilio;Delivery</string>
<string name="poi_delivery">Envío a domicilio;Delivery</string>
<string name="poi_drive_in">Conducir por dentro</string>
<string name="poi_drive_through">Servicio en el automóvil</string>
<string name="poi_takeaway">Comida para llevar</string>
@ -3588,4 +3588,5 @@
<string name="poi_climbing_crag_filter">Peñón de escalada</string>
<string name="poi_rescue_box">Caja de rescate</string>
<string name="poi_climbing_crag">Sí</string>
<string name="reddit">Reddit</string>
</resources>

30
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="rendering_attr_hideHouseNumbers_name">Números de casa</string>
<string name="copying_osmand_file_failed">Falló al copiar archivos</string>
<string name="copying_osmand_file_failed">Fallo al mover archivos</string>
<string name="storage_directory_external">Almacenamiento externo</string>
<string name="storage_directory_multiuser">Almacenamiento multiusuario</string>
<string name="specified_directiory_not_writeable">No se pueden crear mapas en el directorio indicado</string>
@ -30,7 +30,7 @@
<string name="mark_to_delete">Marcar para borrar</string>
<string name="local_osm_changes_upload_all_confirm">¿Subir %1$d cambio(s) a OSM?</string>
<string name="confirmation_to_clear_history">¿Limpiar el historial?</string>
<string name="application_dir_change_warning3">¿Copiar los archivos de datos de OsmAnd al nuevo destino?</string>
<string name="application_dir_change_warning3">¿Mover los archivos de datos de OsmAnd al nuevo destino\?</string>
<string name="storage_directory">Almacenamiento del mapa</string>
<string name="shared_string_places">Lugares</string>
<string name="delay_to_start_navigation_descr">Indica el tiempo de espera para permanecer en la pantalla de planificación de ruta.</string>
@ -1775,7 +1775,7 @@ Lon %2$s</string>
<string name="context_menu_item_open_note">Abrir nota de OSM</string>
<string name="osm_edit_reopened_note">Nota de OSM reabierta</string>
<string name="osm_edit_commented_note">Nota de OSM comentada</string>
<string name="osm_edit_removed_note">Nota de OSM borrada</string>
<string name="osm_edit_removed_note">Nota de OSM resuelta</string>
<string name="osm_edit_created_note">Nota de OSM creada</string>
<string name="osn_bug_name">Nota de OSM</string>
<string name="osn_add_dialog_title">Crear nota</string>
@ -3003,19 +3003,19 @@ Lon %2$s</string>
<string name="avoid_pt_types_descr">Marca los tipos de transporte público a evitar para la navegación:</string>
<string name="avoid_pt_types">Evitar tipos de transporte…</string>
<string name="quick_action_day_night_mode">modo %s</string>
<string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquín</string>
<string name="routing_attr_avoid_sett_name">Evitar el empedrado y adoquinado</string>
<string name="routing_attr_avoid_sett_description">Evita las calles empedradas y adoquinadas</string>
<string name="shared_string_degrees">Grados</string>
<string name="shared_string_milliradians">Mil angular</string>
<string name="angular_measeurement">Unidades de medición angular</string>
<string name="angular_measeurement">Unidad angular</string>
<string name="angular_measeurement_descr">Cambiar el acimut en el que se mide.</string>
<string name="routing_attr_avoid_tram_name">Evitar los tranvías</string>
<string name="routing_attr_avoid_tram_name">Evitar tranvías</string>
<string name="routing_attr_avoid_tram_description">Evita usar los tranvías</string>
<string name="routing_attr_avoid_bus_name">Evitar los autobuses</string>
<string name="routing_attr_avoid_bus_name">Evitar autobuses</string>
<string name="routing_attr_avoid_bus_description">Evita usar los autobuses y trolebuses</string>
<string name="routing_attr_avoid_share_taxi_name">Evitar los taxis colectivos</string>
<string name="routing_attr_avoid_share_taxi_name">Evitar taxis colectivos</string>
<string name="routing_attr_avoid_share_taxi_description">Evita usar los taxis colectivos</string>
<string name="routing_attr_avoid_train_name">Evitar los trenes</string>
<string name="routing_attr_avoid_train_name">Evitar trenes</string>
<string name="routing_attr_avoid_train_description">Evita usar los trenes</string>
<string name="routing_attr_avoid_subway_name">Evitar subterráneos</string>
<string name="routing_attr_avoid_subway_description">Evita usar los subterráneos y trenes ligeros</string>
@ -3030,4 +3030,16 @@ Lon %2$s</string>
\n • Visualización de medida «azimut» en «Medir distancia»
\n</string>
<string name="send_log">Enviar registro del problema</string>
<string name="files_moved">Se movieron %1$d archivos (%2$s).</string>
<string name="files_copied">Se copiaron %1$d archivos (%2$s).</string>
<string name="files_failed">Error al copiar %1$d archivo(s) (%2$s).</string>
<string name="files_present">Existen %1$d archivo(s) (%2$s) en la ubicación anterior «%3$s».</string>
<string name="move_maps">Mover mapas</string>
<string name="dont_move_maps">No mover</string>
<string name="public_transport_ped_route_title">La ruta a pie es de aproximadamente %1$s y podría ser más rápida que en transporte público</string>
<string name="public_transport_no_route_title">Por desgracia, OsmAnd no pudo encontrar una ruta adecuada para sus ajustes.</string>
<string name="public_transport_try_ped">Prueba la navegación a pie.</string>
<string name="public_transport_try_change_settings">Intenta cambiar los ajustes.</string>
<string name="public_transport_calc_pedestrian">Calcular la ruta a pie</string>
<string name="public_transport_type">Tipo de transporte</string>
</resources>

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

@ -352,7 +352,7 @@
<string name="poi_crematorium">Crematorio</string>
<string name="poi_bank">Banco</string>
<string name="poi_amenity_atm">Cajero automático</string>
<string name="poi_accountant">Contable</string>
<string name="poi_accountant">Estudio contable;Contador</string>
<string name="poi_cave_entrance">Entrada a cueva</string>
<string name="poi_volcano">Volcán</string>
<string name="poi_crater">Cráter</string>

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

@ -1791,7 +1791,7 @@
<string name="context_menu_item_open_note">Abrir nota de OSM</string>
<string name="osm_edit_reopened_note">Nota de OSM reabierta</string>
<string name="osm_edit_commented_note">Nota de OSM comentada</string>
<string name="osm_edit_removed_note">Nota de OSM borrada</string>
<string name="osm_edit_removed_note">Nota de OSM resuelta</string>
<string name="osm_edit_created_note">Nota de OSM creada</string>
<string name="osn_bug_name">Nota de OSM</string>
<string name="osn_add_dialog_title">Crear nota</string>

53
OsmAnd/res/values-eu/strings.xml
View file

@ -468,7 +468,7 @@
<string name="oclock">puntuan</string>
<string name="towards">honuntz</string>
<string name="accuracy">Zehastasuna</string>
<string name="altitude">Altuera</string>
<string name="altitude">Altitudea</string>
<string name="no_info">Informaziorik ez</string>
<string name="direction_style_sidewise">Ezkerreruntz (8 sektore)</string>
<string name="direction_style_clockwise">Eskubiruntz (12 sektore)</string>
@ -533,7 +533,7 @@
<string name="user_name">Zure OSM erabiltzailea</string>
<string name="open_street_map_login_descr">Beharrezkoa openstreetmap.org-eko bidalketentzat.</string>
<string name="user_password">Zure OSMeko pasahitza</string>
<string name="osmand_service">Bigarren planoko modua</string>
<string name="osmand_service">Atzeko plano modua</string>
<string name="osmand_service_descr">OsmAnd bigarren planoan dabil pantaila itzalia dagoen bitartean.</string>
<string name="download_files_not_enough_space">Ez dago leku nahikorik %1$s MB deskargatzeko (%2$s libre).</string>
<string name="download_files_question_space">{0} fitxategi deskargatu?
@ -672,12 +672,12 @@ Biltegiratzean {1} MB erabiliko dira.
<string name="shared_string_previous">Aurrekoa</string>
<string name="unit_of_length_descr">Aldatu distantzia neurtzeko unitateak.</string>
<string name="unit_of_length">Luzera unitatea</string>
<string name="si_mi_feet">Miliak/oinak</string>
<string name="si_mi_feet">Miliak/Oin</string>
<string name="si_mi_yard">Miliak/yardak</string>
<string name="si_km_m">Kilometroak/metroak</string>
<string name="yard">yd</string>
<string name="foot">oin</string>
<string name="mile_per_hour">m/h</string>
<string name="mile_per_hour">mph</string>
<string name="mile">mi</string>
<string name="send_location_way_choose_title">Kokapena partekatu erabiliz</string>
<string name="send_location_sms_pattern">Kokapena: %1$s⏎\n%2$s</string>
@ -871,7 +871,7 @@ Biltegiratzean {1} MB erabiliko dira.
<string name="transport_stops_to_pass">pasatu beharreko geltokiak</string>
<string name="transport_route_distance">Ibilbidearen distantzia</string>
<string name="transport">Garraioa</string>
<string name="shared_string_ok">Ados</string>
<string name="shared_string_ok">ADOS</string>
<string name="show_transport_over_map_description">Erakutsi garraio publikoaren geltokiak mapan.</string>
<string name="show_transport_over_map">Erakutsi garraioaren geltokiak</string>
<string name="hello">OsmAnd nabigazio aplikazioa</string>
@ -984,7 +984,7 @@ Biltegiratzean {1} MB erabiliko dira.
<string name="show_gps_coordinates_text">Erakutsi GPS koordenatuak mapan</string>
<string name="use_internet_to_download_tile">Deskargatu falta diren tesela mapak</string>
<string name="app_description">Nabigazio aplikazioa</string>
<string name="shared_string_exit">Atera</string>
<string name="shared_string_exit">Irten</string>
<string name="search_button">Bilatu</string>
<string name="search_activity">Bilatu</string>
<string name="searchpoi_activity">Aukeratu POI-a</string>
@ -1123,7 +1123,7 @@ Biltegiratzean {1} MB erabiliko dira.
<string name="av_camera_pic_size">Kameraren irudiaren tamaina</string>
<string name="av_camera_pic_size_descr">Aukeratu barne-kameraren irudiaren tamaina.</string>
<string name="navigation_intent_invalid">Baliogabeko formatuak: %s</string>
<string name="shared_string_share">Banatu</string>
<string name="shared_string_share">Partekatu</string>
<string name="share_fav_subject">OsmAnd bidez partekatutako gogokoak</string>
<string name="import_file_favourites">Gorde datuak GPX fitxategi bezala edo inportatu bide-puntuak \'Gogoko\' gisa?</string>
<string name="keep_informing_never">Inoiz</string>
@ -1259,7 +1259,7 @@ Lorratza %2$s</string>
<string name="shared_string_ellipsis">…</string>
<string name="shared_string_do_not_use">Ez erabili</string>
<string name="shared_string_enable">Gaitu</string>
<string name="shared_string_disable">Ezgaitu</string>
<string name="shared_string_disable">Desgaitu</string>
<string name="shared_string_enabled">Gaituta</string>
<string name="shared_string_disabled">Ezgaituta</string>
<string name="shared_string_selected">Hautatuta</string>
@ -1415,9 +1415,9 @@ Lorratza %2$s</string>
<string name="favorite_category_select">Hautatu kategoria</string>
<string name="default_speed_system_descr">Zehaztu abiadura unitatea.</string>
<string name="default_speed_system">Abiadura unitatea</string>
<string name="si_kmh">Kilometroak orduko</string>
<string name="si_m_s">Metroak segundoko</string>
<string name="si_min_km">Minutuak kilometroko</string>
<string name="si_kmh">Kilometro orduko</string>
<string name="si_m_s">Metro segunduko</string>
<string name="si_min_km">Minutu kilometroko</string>
<string name="min_mile">min/m</string>
<string name="min_km">min/km</string>
<string name="m_s">m/s</string>
@ -1461,7 +1461,7 @@ Lorratza %2$s</string>
<string name="shared_string_logoff">Itxi saioa</string>
<string name="rendering_attr_hideHouseNumbers_name">Etxeen zenbakiak</string>
<string name="specified_directiory_not_writeable">Ezin izan dira mapak zehaztutako direktorioan sortu</string>
<string name="copying_osmand_file_failed">Fitxategiak kopiatzeak huts egin du</string>
<string name="copying_osmand_file_failed">Fitxategiak lekuz aldatzean huts egin du</string>
<string name="storage_directory_external">Kanpo biltegiratzea</string>
<string name="storage_directory_internal_app">Barne aplikazio memoria</string>
<string name="storage_directory_manual">Eskuz zehaztuta</string>
@ -1679,9 +1679,9 @@ Eskuragarri {2} MB besterik ez daude.</string>
<string name="storage_directory_card">Memoria txartela</string>
<string name="hillshade_layer_disabled">Erliebe-itzalak geruza desgaituta</string>
<string name="nm">nmi</string>
<string name="si_nm">Itsas miliak</string>
<string name="si_mph">Miliak orduko</string>
<string name="si_min_m">Minutuak miliako</string>
<string name="si_nm">Milia nautikoak</string>
<string name="si_mph">Milia orduko</string>
<string name="si_min_m">Minutu miliaro</string>
<string name="si_nm_h">Itsas miliak orduko (korapiloak)</string>
<string name="nm_h">kn</string>
<string name="av_locations_descr">GPX fitxategia ohar-kokapenekin.</string>
@ -1717,7 +1717,7 @@ Eskuragarri {2} MB besterik ez daude.</string>
<string name="disable_recording_once_app_killed">Eragotzi bigarren planoko egunkaria</string>
<string name="disable_recording_once_app_killed_descrp">GPX erregistroa geldiaraziko du aplikazioa hiltzean (azken aplikazioak pantailaren bidez). (OsmAnd bigarren planoan dabilela adierazten duen ikonoa Android jakinarazpen barratik desagertuko da)</string>
<string name="rendering_value_walkingRoutesOSMC_name">OSMC bidezidor kirol sinboloen araberako koloreztatzea</string>
<string name="application_dir_change_warning3">Kopiatu OsmAnd-en datu fitxategiak xede berrira ?</string>
<string name="application_dir_change_warning3">Eraman OsmAnd-en datu fitxategiak xede berrira \?</string>
<string name="storage_directory_multiuser">Erabiltzaile anitzeko biltegiratzea</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM kartografia laguntzailea</string>
<string name="welcome_select_region">Trafiko seinaleak eta arauak ongi adierazteko, mesedez hautatu zure gidatze eremua:</string>
@ -1807,7 +1807,7 @@ Eskuragarri {2} MB besterik ez daude.</string>
<string name="duration">Iraupena</string>
<string name="distance">Distantzia</string>
<string name="index_tours">Ibilaldiak</string>
<string name="shared_string_all">Guztiak</string>
<string name="shared_string_all">Guztia</string>
<string name="rendering_value_browse_map_name">Arakatu mapa</string>
<string name="rendering_value_car_name">Kotxea</string>
<string name="rendering_value_bicycle_name">Bizikleta</string>
@ -3008,6 +3008,23 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="rendering_attr_surface_sett_name">Galtzada-harria</string>
<string name="rendering_attr_surface_cobblestone_name">Galtzadarria</string>
<string name="rendering_attr_surface_fine_gravel_name">Legarra</string>
<string name="routing_attr_avoid_sett_name"/>
<string name="routing_attr_avoid_sett_name">Saihestu harri eta baldosa galtzadak</string>
<string name="send_log">Bidali egunkaria</string>
<string name="files_moved">%1$d fitxategi mugituta (%2$s).</string>
<string name="files_copied">%1$d fitxategi kopiatuta (%2$s).</string>
<string name="files_failed">%1$d fitxategi kopiatzeak huts egin du (%2$s).</string>
<string name="move_maps">Mugitu mapak</string>
<string name="dont_move_maps">Ez mugitu</string>
<string name="public_transport_ped_route_title">Oinezko bidea</string>
<string name="public_transport_no_route_title">Tamalez, OsmAnd-ek ezin izan du zure ezarpenetarako bide egokirik aurkitu.</string>
<string name="public_transport_try_ped">Saiatu oinezko nabigazioa.</string>
<string name="public_transport_try_change_settings">Saiatu ezarpenak aldatzen.</string>
<string name="public_transport_calc_pedestrian">Kalkulatu</string>
<string name="public_transport_type">Garraio mota</string>
<string name="shared_string_milliradians">Miliradianak</string>
<string name="angular_measeurement">Neurri-unitate angularra</string>
<string name="angular_measeurement_descr">Aldatu zertan azimuta neurtzen den.</string>
<string name="rendering_attr_surface_pebblestone_name">Hartxindar bidea</string>
<string name="rendering_attr_surface_gravel_name">Hartxindarra</string>
<string name="routing_attr_avoid_sett_description">Saihestu harri eta baldosa galtzadak</string>
</resources>

5
OsmAnd/res/values-fa/phrases.xml
View file

@ -39,7 +39,7 @@
<string name="poi_bedding">پنبه زنی</string>
<string name="poi_dive">تجهیزات غواصی</string>
<string name="poi_doityourself">فروشگاه بهسازی خانه</string>
<string name="poi_erotic"></string>
<string name="poi_erotic"/>
<string name="poi_fishing">لوازم ماهیگیری</string>
<string name="poi_florist">گلفروشی</string>
<string name="poi_frame">قاب سازی</string>
@ -77,7 +77,7 @@
<string name="poi_ticket">فروشگاه بلیط</string>
<string name="poi_tobacco">دخانیات</string>
<string name="poi_toys">اسباب بازی فروشی</string>
<string name="poi_trade">باربری</string>
<string name="poi_trade"></string>
<string name="poi_vacuum_cleaner">فروشگاه جاروبرقی</string>
<string name="poi_variety_store">فروشگاه متنوع و ارزان</string>
<string name="poi_video">کلوب فیلم</string>
@ -1347,4 +1347,5 @@
<string name="poi_park_ride_hov">خودروی پرسرنشین</string>
<string name="poi_park_ride_tram">تراموا</string>
<string name="poi_park_ride_ferry">فرابر</string>
<string name="poi_logistics">دفتر باربری</string>
</resources>

21
OsmAnd/res/values-fa/strings.xml
View file

@ -1352,7 +1352,7 @@
<string name="arrival_distance_factor_at_last">در چند متر آخر</string>
<string name="av_camera_pic_size">اندازهٔ عکس دوربین</string>
<string name="av_camera_pic_size_descr">اندازهٔ عکس دوربین داخلی را انتخاب کنید.</string>
<string name="rename_failed">تغییر نام انجام نشد.</string>
<string name="rename_failed">تغییر نام ناموفق بود.</string>
<string name="days_behind">روز قبل</string>
<string name="shared_string_currently_recording_track">ردّ در حال ضبط</string>
<string name="back_to_map">برگشتن به نقشه</string>
@ -1476,9 +1476,9 @@
<string name="speed_limit_exceed_message">محدودهٔ حداکثر سرعت را انتخاب کنید؛ با گذشتن از این مقدار، آوای هشدار پخش می‌شود.</string>
<string name="fav_point_emoticons_message">نام نقطهٔ برگزیده به %1$s تغییر کرد تا ذخیره‌سازی آن به‌همراه شکلک‌ها در فایل تسهیل شود.</string>
<string name="rendering_attr_hideHouseNumbers_name">پلاک خانه‌ها</string>
<string name="application_dir_change_warning3">فایل‌های دادهٔ OsmAnd به مکان جدید کپی شود؟</string>
<string name="application_dir_change_warning3">فایل‌های دادهٔ OsmAnd به مکان جدید منتقل شود؟</string>
<string name="specified_directiory_not_writeable">نمی‌توان نقشه‌ها را در پوشهٔ موردنظر ایجاد کرد</string>
<string name="copying_osmand_file_failed">کپی‌کردن فایل‌ها ناموفق بود</string>
<string name="copying_osmand_file_failed">انتقال فایل‌ها ناموفق بود</string>
<string name="storage_directory_external">ذخیره‌گاه خارجی</string>
<string name="storage_directory_multiuser">ذخیره‌گاه چندکاربره</string>
<string name="storage_directory_internal_app">حافظهٔ داخلی برنامه</string>
@ -2093,7 +2093,7 @@
<string name="rate_this_app_long">لطفاً در فروشگاه Play به OsmAnd امتیاز بدهید</string>
<string name="user_hates_app_get_feedback">لطفاً علتش به ما بگویید.</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="successfully_uploaded_pattern">{0} مورد از {1} مورد آپلود شد</string>
<string name="try_again">تلاش مجدد</string>
@ -3067,4 +3067,17 @@
\n
\n • نمایش سمت (azimuth) در اندازه‌گیری مسافت
\n</string>
<string name="files_moved">%1$d فایل منتقل شد (%2$s).</string>
<string name="files_copied">%1$d فایل کپی شد (%2$s).</string>
<string name="files_failed">کپی %1$d فایل (%2$s) ناموفق بود.</string>
<string name="files_present">%1$d فایل (%2$s) در مکان قبلی وجود دارد: \'%3$s\'</string>
<string name="move_maps">نقشه‌ها را منتقل کن</string>
<string name="dont_move_maps">منتقل نکن</string>
<string name="public_transport_ped_route_title">مسیر پیاده حدود %1$s است و به‌نظر می‌رسد سریع‌تر از حمل‌ونقل عمومی باشد</string>
<string name="public_transport_no_route_title">متأسفانه OsmAnd نتوانست مسیری متناسب با تنظیمات شما بیابد.</string>
<string name="public_transport_try_ped">ناوبری پیاده را امتحان کنید.</string>
<string name="public_transport_try_change_settings">با تنظیمات دیگر امتحان کنید.</string>
<string name="public_transport_calc_pedestrian">محاسبهٔ مسیر پیاده</string>
<string name="public_transport_type">نوع حمل‌ونقل</string>
<string name="send_log">ارسال گزارش</string>
</resources>

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

@ -3285,4 +3285,251 @@
<string name="poi_rtsa_scale_3b">3Б</string>
<string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
<string name="poi_climbing_crag">Oui</string>
<string name="poi_climbing_crag_filter">Rocher d\'escalade</string>
<string name="poi_free_flying_guest_guidelines_yes">Directives à l\'intention des invités : oui</string>
<string name="poi_free_flying_guest_guidelines_no">Directives à l\'intention des invités : non</string>
<string name="poi_fire_hydrant_type_dry_barrel">Fût sec</string>
<string name="poi_health_person_type_assistant">Rôle de l\'agent de santé : assistant</string>
<string name="poi_health_person_type_healer">Rôle de l\'agent de santé : guérisseur</string>
<string name="poi_health_person_type_midwife">Rôle de l\'agent de santé : sage-femme</string>
<string name="poi_health_person_type_nurse">Rôle de l\'agent de santé : infirmière</string>
<string name="poi_health_person_type_physician_assitant">Rôle de l\'agent de santé : assistant médical</string>
<string name="poi_health_person_type_witchdoctor">Rôle de l\'agent de santé : sorcier</string>
<string name="poi_counselling_type_addiction_yes">Conseiller (toxicomanie) : oui</string>
<string name="poi_counselling_type_addiction_no">Conseiller (dépendance) : non</string>
<string name="poi_counselling_type_antenatal_yes">Conseiller (prénatal) : oui</string>
<string name="poi_counselling_type_antenatal_no">Conseiller (prénatal) : non</string>
<string name="poi_counselling_type_child_guidance_yes">Conseiller (orientation de l\'enfant) : oui</string>
<string name="poi_counselling_type_child_guidance_no">Conseiller (orientation de l\'enfant) : non</string>
<string name="poi_counselling_type_couple_yes">Conseiller (couple) : oui</string>
<string name="poi_counselling_type_couple_no">Conseiller (couple) : non</string>
<string name="poi_counselling_type_crisis_yes">Conseiller (crise) : oui</string>
<string name="poi_counselling_type_crisis_no">Conseiller (crise) : non</string>
<string name="poi_counselling_type_drugs_yes">Conseiller (drogues) : oui</string>
<string name="poi_counselling_type_drugs_no">Conseiller (médicaments) : non</string>
<string name="poi_counselling_type_education_yes">Conseiller (éducation) : oui</string>
<string name="poi_counselling_type_education_no">Conseiller (éducation) : non</string>
<string name="poi_counselling_type_family_yes">Conseiller (famille) : oui</string>
<string name="poi_counselling_type_family_no">Conseiller (famille) : non</string>
<string name="poi_counselling_type_homeless_yes">Conseiller (sans-abri) : oui</string>
<string name="poi_counselling_type_homeless_no">Conseiller (sans-abri) : non</string>
<string name="poi_counselling_type_immigrant_yes">Conseiller (immigrant) : oui</string>
<string name="poi_counselling_type_immigrant_no">Conseiller (immigrant) : non</string>
<string name="poi_counselling_type_marriage_yes">Conseiller (mariage) : oui</string>
<string name="poi_counselling_type_marriage_no">Conseiller (mariage) : non</string>
<string name="poi_counselling_type_nutrition_yes">Conseiller (nutrition) : oui</string>
<string name="poi_counselling_type_nutrition_nfire_hydo">Conseiller (nutrition) : non</string>
<string name="poi_counselling_type_rehabilitation_yes">Conseiller (réadaptation) : oui</string>
<string name="poi_counselling_type_rehabilitation_no">Conseiller (réadaptation) : non</string>
<string name="poi_counselling_type_sexual_yes">Conseiller (sexuel) : oui</string>
<string name="poi_counselling_type_sexual_no">Conseiller (sexuel) : non</string>
<string name="poi_counselling_type_sexual_abuse_yes">Conseiller (abus sexuel) : oui</string>
<string name="poi_counselling_type_sexual_abuse_no">Conseiller (abus sexuel) : non</string>
<string name="poi_counselling_type_victim_yes">Conseiller (victime) : oui</string>
<string name="poi_counselling_type_victim_no">Conseiller (victime) : non</string>
<string name="poi_counselling_type_violence_yes">Conseiller (violence) : oui</string>
<string name="poi_counselling_type_violence_no">Conseiller (violence) : non</string>
<string name="poi_provided_for_infant_yes">Prévu pour les nourrissons : oui</string>
<string name="poi_provided_for_infant_no">Prévu pour les nourrissons : non</string>
<string name="poi_provided_for_toddler_yes">Prévu pour les tout-petits : oui</string>
<string name="poi_provided_for_toddler_no">Pour les tout-petits : non</string>
<string name="poi_provided_for_child_yes">Pour les enfants : oui</string>
<string name="poi_provided_for_child_no">Pour les enfants : non</string>
<string name="poi_provided_for_adult_yes">Pour les adultes : oui</string>
<string name="poi_provided_for_adult_no">Pour les adultes : non</string>
<string name="poi_provided_for_woman_yes">Prévu pour les femmes : oui</string>
<string name="poi_provided_for_woman_no">Prévu pour les femmes : non</string>
<string name="poi_provided_for_senior_yes">Pour les personnes âgées : oui</string>
<string name="poi_provided_for_senior_no">Pour les personnes âgées : non</string>
<string name="poi_provided_for_girl_yes">Prévu pour les filles : oui</string>
<string name="poi_provided_for_girl_no">Pour les filles : non</string>
<string name="poi_provided_for_man_yes">Prévu pour les hommes : oui</string>
<string name="poi_provided_for_man_no">Prévu pour les hommes : non</string>
<string name="poi_provided_for_boy_yes">Pour les garçons : oui</string>
<string name="poi_provided_for_boy_no">Pour les garçons : non</string>
<string name="poi_treat_inpatient_yes">Services aux patients hospitalisés : oui</string>
<string name="poi_treat_inpatient_no">Services aux patients hospitalisés : non</string>
<string name="poi_treat_inpatient_only">Services aux patients hospitalisés : seulement</string>
<string name="poi_counselling_yes">Conseils: oui</string>
<string name="poi_counselling_no">Conseils : non</string>
<string name="poi_office_physician">Cabinet de médecin</string>
<string name="poi_office_therapist">Bureau de thérapeute</string>
<string name="poi_office_podologist">Cabinet du podologue</string>
<string name="poi_office_healer">Bureau du guérisseur</string>
<string name="poi_office_psychologist">Bureau du psychologue</string>
<string name="poi_office_nursing_service">Service de soins infirmiers</string>
<string name="poi_office_midwife">Cabinet de sage-femme</string>
<string name="poi_fire_hydrant_diameter">Diamètre de la bouche d\'incendie</string>
<string name="poi_fire_hydrant_style_wsh">Borne d\'incendie style : wsh</string>
<string name="poi_street_cabinet_power">Type d\'armoire : puissance</string>
<string name="poi_pump_type_india_mk_2_3">Type de pompe : Inde Mk II ou III&gt;</string>
<string name="poi_pump_type_gravity">Pompe de type : gravité</string>
<string name="poi_pump_style_historic">Style de pompe : historique</string>
<string name="poi_observatory_type_gravitational">Gravitationnel</string>
<string name="poi_generator_output_electricity_yes">Sortie: électricité</string>
<string name="poi_generator_output_hot_water">Puissance de sortie de l\'eau chaude</string>
<string name="poi_aquaculture_shrimp">Aquaculture : crevettes</string>
<string name="poi_aquaculture_mussels">Aquaculture : moules</string>
<string name="poi_cuisine_fine_dining">Cuisine raffinée</string>
<string name="poi_cuisine_savory_pancakes">Crêpes salées</string>
<string name="poi_animal_keeping_type_open_stable">Type : écurie ouverte</string>
<string name="poi_tower_construction_lattice">Construction : treillis</string>
<string name="poi_energy_supplier">Bureau des fournisseurs d\'énergie</string>
<string name="poi_resort_kids_camp">Camp pour enfants</string>
<string name="poi_zoo_petting_zoo">Zoo pour enfants</string>
<string name="poi_zoo_wildlife_park">Parc animalier</string>
<string name="poi_zoo_enclosure">Enceinte</string>
<string name="poi_zoo_safari_park">Parc safari</string>
<string name="poi_stands">Râtelier pour vélo</string>
<string name="poi_motorcycle_type_sportbike">Vélo de sport</string>
<string name="poi_motorcycle_type_chopper">Hachoir</string>
<string name="poi_motorcycle_type_offroad">Hors route</string>
<string name="poi_generator_output_electricity_no">Production (électricité) : non</string>
<string name="poi_animal_shelter_purpose_adoption_yes">Adoption : oui</string>
<string name="poi_animal_shelter_purpose_adoption_no">Adoption : non</string>
<string name="poi_animal_shelter_purpose_release_yes">Libre : oui</string>
<string name="poi_animal_shelter_purpose_release_no">Libre : non</string>
<string name="poi_winter_room_yes">Salle d\'hiver: oui</string>
<string name="poi_winter_room_no">Salle d\'hiver: non</string>
<string name="poi_boat_houseboat_rental_yes">Péniches: oui</string>
<string name="poi_boat_houseboat_rental_no">Péniches: non</string>
<string name="poi_boat_dinghy_rental_rental_yes">Canot : oui</string>
<string name="poi_boat_dinghy_rental_rental_no">Canot : non</string>
<string name="poi_water_place_durability_durable">Durabilité des plans d\'eau : durable</string>
<string name="poi_water_place_durability_emergency">Durabilité des plans d\'eau : urgence</string>
<string name="poi_water_purification_chlorine">Chlore</string>
<string name="poi_water_supply_water_well">Puits d’eau</string>
<string name="poi_water_supply_pipeline">Pipeline</string>
<string name="poi_water_supply_borehole">Trou de forage</string>
<string name="poi_socket_cee_blue">Prise de courant : Bleu CEE</string>
<string name="poi_socket_cee_blue_current">Prise de courant : Bleu CEE : courant</string>
<string name="poi_socket_cee_blue_output">Prise de courant : Bleu CEE : sortie</string>
<string name="poi_socket_cee_red_16a">Prise de courant : Rouge CEE 16A</string>
<string name="poi_socket_cee_red_16a_current">Prise de courant : Rouge CEE 16A : courant</string>
<string name="poi_socket_cee_red_16a_output">Prise de courant : CEE rouge 16A : sortie</string>
<string name="poi_socket_cee_red_32a">Prise de courant : Rouge CEE 32A</string>
<string name="poi_socket_cee_red_32a_current">Prise de courant : CEE rouge 32A : courant</string>
<string name="poi_socket_cee_red_32a_output">Prise de courant : CEE rouge 32A : sortie</string>
<string name="poi_socket_cee_red_64a">Prise de courant : Rouge CEE 64A</string>
<string name="poi_socket_cee_red_64a_current">Prise de courant : CEE rouge 64A : courant</string>
<string name="poi_socket_cee_red_64a_output">Prise de courant : CEE rouge 64A : sortie</string>
<string name="poi_socket_cee_red_125a">Prise de courant : Rouge CEE 125A</string>
<string name="poi_socket_cee_red_125a_current">Prise de courant : Rouge CEE 125A : courant</string>
<string name="poi_socket_cee_red_125a_output">Prise de courant : CEE rouge 125A : sortie</string>
<string name="poi_socket_type1">Prise de courant : Type 1</string>
<string name="poi_socket_type1_current">Prise de courant : Type 1 : courant</string>
<string name="poi_socket_type1_output">Prise de courant : Type 1 : sortie</string>
<string name="poi_socket_type1_combo">Prise de courant : Type 1 combo</string>
<string name="poi_socket_type1_combo_current">Prise de courant : Type 1 combo : courant</string>
<string name="poi_socket_type1_combo_output">Prise de courant : Type 1 combo : sortie</string>
<string name="poi_socket_type2">Prise de courant : Type 2</string>
<string name="poi_socket_type2_current">Prise de courant : Type 2 : courant</string>
<string name="poi_socket_type2_output">Prise de courant : Type 2 : sortie</string>
<string name="poi_socket_type2_combo">Prise de courant : Type 2 combo</string>
<string name="poi_socket_type2_combo_current">Prise de courant : Type 2 combo : courant</string>
<string name="poi_socket_type2_combo_output">Prise de courant : Type 2 combo : sortie</string>
<string name="poi_socket_type3">Prise de courant : Type 3</string>
<string name="poi_socket_type3_current">Prise de courant : Type 3 : courant</string>
<string name="poi_socket_type3_output">Prise de courant : Type 3 : sortie</string>
<string name="poi_socket_chademo">Prise de courant : CHAdeMO</string>
<string name="poi_socket_chademo_current">Prise de courant : CHAdeMO : actuel</string>
<string name="poi_socket_chademo_output">Prise de courant : CHAdeMO : sortie</string>
<string name="poi_socket_tesla_standard">Prise de courant : norme Tesla</string>
<string name="poi_socket_tesla_standard_current">Prise de courant : Norme Tesla : courant</string>
<string name="poi_socket_tesla_standard_output">Prise de courant : Norme Tesla : sortie</string>
<string name="poi_socket_tesla_supercharger">Prise de courant : Superchargeur Tesla</string>
<string name="poi_socket_tesla_supercharger_current">Prise de courant : Superchargeur Tesla : courant</string>
<string name="poi_socket_tesla_supercharger_output">Prise de courant : Superchargeur Tesla : sortie</string>
<string name="poi_socket_tesla_roadster">Prise de courant : Tesla Roadster</string>
<string name="poi_socket_tesla_roadster_current">Prise de courant : Tesla Roadster : courant</string>
<string name="poi_socket_tesla_roadster_output">Prise de courant : Tesla Roadster : sortie</string>
<string name="poi_socket_nema_5_15">Prise de courant : NEMA 5-15R</string>
<string name="poi_socket_nema_5_15_current">Prise de courant : NEMA 5-15R : courant</string>
<string name="poi_socket_nema_5_15_output">Prise de courant : NEMA 5-15R : sortie</string>
<string name="poi_socket_nema_5_20">Prise de courant : NEMA 5-20</string>
<string name="poi_socket_nema_5_20_current">Prise de courant : NEMA 5-20 : courant</string>
<string name="poi_socket_nema_5_20_output">Prise de courant : NEMA 5-20 : sortie</string>
<string name="poi_socket_nema_14_30">Prise de courant : NEMA 14-30</string>
<string name="poi_socket_nema_14_30_current">Prise de courant : NEMA 14-30 : courant</string>
<string name="poi_socket_nema_14_30_output">Prise de courant : NEMA 14-30 : sortie</string>
<string name="poi_socket_nema_14_50">Prise de courant : NEMA 14-50</string>
<string name="poi_socket_nema_14_50_current">Prise de courant : NEMA 14-50 : courant</string>
<string name="poi_socket_nema_14_50_output">Prise de courant : NEMA 14-50 : sortie</string>
<string name="poi_socket_schuko">Prise de courant : Schuko</string>
<string name="poi_socket_schuko_current">Prise de courant : Schuko : courant</string>
<string name="poi_socket_schuko_output">Prise de courant : Schuko : sortie</string>
<string name="poi_socket_bs1363">Prise de courant : BS 1363</string>
<string name="poi_socket_bs1363_current">Prise de courant : BS 1363 : courant</string>
<string name="poi_socket_bs1363_output">Prise de courant : BS 1363 : sortie</string>
<string name="poi_socket_as3112">Prise de courant : AS/NZS 3112</string>
<string name="poi_socket_as3112_current">Prise de courant : AS/NZS 3112 : courant</string>
<string name="poi_socket_as3112_output">Prise de courant : AS/NZS 3112 : sortie</string>
<string name="poi_charging_station_output">Sortie de la station de recharge</string>
<string name="poi_charging_station">Station de recharge</string>
<string name="poi_depot">Dépôt</string>
<string name="poi_money_transfer">Transfert d’argent</string>
<string name="poi_climbing_deepwater_yes">Solo en eau profonde : oui</string>
<string name="poi_climbing_deepwater_no">Solo en eau profonde : non</string>
<string name="poi_climbing_length">Longueur d\'escalade</string>
<string name="poi_climbing_length_min">Longueur minimum d\'escalade</string>
<string name="poi_climbing_length_max">Longueur maxi d\'escalade</string>
<string name="poi_climbing_rock_limestone">Rocher d\'escalade : calcaire</string>
<string name="poi_climbing_rock_granite">Rocher d\'escalade : granit</string>
<string name="poi_climbing_rock_sandstone">Rocher d\'escalade : grès</string>
<string name="poi_climbing_rock_quartzite">Roche d\'escalade : quartzite</string>
<string name="poi_climbing_rock_gneiss">Rocher d\'escalade : gneiss</string>
<string name="poi_climbing_rock_porphyry">Rocher d\'escalade : porphyre</string>
<string name="poi_meadow_agricultural">Type : agricole</string>
<string name="poi_meadow_perpetual">Type : perpétuel</string>
<string name="poi_meadow_transitional">Type : transitoire</string>
<string name="poi_meadow_pasture">Type : pâturage</string>
<string name="poi_socket_cee_blue_yes">Bleu CEE</string>
<string name="poi_socket_cee_red_16a_yes">Rouge CEE 16A</string>
<string name="poi_socket_cee_red_32a_yes">Rouge CEE 32A</string>
<string name="poi_socket_cee_red_64a_yes">Rouge CEE 64A</string>
<string name="poi_socket_cee_red_125a_yes">Rouge CEE 125A</string>
<string name="poi_socket_type1_combo_yes">Type 1 combo</string>
<string name="poi_socket_tesla_standard_yes">Norme Tesla</string>
<string name="poi_socket_tesla_supercharger_yes">Superchargeur Tesla</string>
<string name="poi_socket_chademo_output_high">Élevée</string>
<string name="poi_socket_chademo_output_medium">Moyenne</string>
<string name="poi_socket_chademo_output_low">Faible</string>
<string name="poi_socket_type2_combo_output_medium">Moyenne</string>
<string name="poi_socket_type2_combo_output_low">Faible</string>
<string name="poi_socket_type3_output_high">Élevée</string>
<string name="poi_socket_type3_output_medium">Moyenne</string>
<string name="poi_socket_type3_output_low">Faible</string>
<string name="poi_socket_cee_blue_output_high">Élevée</string>
<string name="poi_socket_cee_blue_output_medium">Moyenne</string>
<string name="poi_socket_cee_blue_output_low">Faible</string>
<string name="poi_socket_schuko_output_high">Élevée</string>
<string name="poi_socket_schuko_output_medium">Moyenne</string>
<string name="poi_socket_schuko_output_low">Faible</string>
<string name="poi_childcare">Garde d’enfants</string>
<string name="poi_denotation_natural_monument">Monument naturel</string>
<string name="poi_denotation_landmark">Point de repère</string>
<string name="poi_change_delete">Objet supprimé</string>
<string name="poi_rescue_box">Boîte de sauvetage</string>
<string name="poi_climbing_boulder_yes">Bloc : oui</string>
<string name="poi_climbing_boulder_no">Bloc : non</string>
<string name="poi_climbing_toprope_yes">Moulinette : oui</string>
<string name="poi_climbing_toprope_no">Moulinette : non</string>
<string name="poi_climbing_multipitch_yes">Voie en plusieurs longueurs : oui</string>
<string name="poi_climbing_multipitch_no">Voie en plusieurs longueurs : non</string>
<string name="poi_climbing_bolted_yes">Mousquetons fixés : oui</string>
<string name="poi_climbing_bolted_no">Mousquetons fixés : non</string>
<string name="poi_circumference">Circonférence</string>
<string name="poi_socket_chademo_yes">CHAdeMO</string>
<string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
<string name="poi_barbecue_grill">Grille de barbecue : oui</string>
<string name="poi_service_vehicle_wheels_yes">Pneus</string>
<string name="poi_service_vehicle_glass_yes">Vitres</string>
<string name="poi_service_vehicle_truck_repair_yes">Réparation de camion</string>
<string name="poi_service_vehicle_muffler_yes">Silencieux</string>
<string name="poi_service_vehicle_alignment_yes">Alignement</string>
<string name="poi_service_vehicle_transmission_repair_yes">Réparation de la transmission</string>
<string name="poi_aerialway_zip_line">Tyrolienne</string>
<string name="poi_cable_number">Numéro de câble</string>
<string name="poi_outcrop">Affleurement</string>
<string name="poi_atoll">Atoll</string>
</resources>

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

@ -1524,7 +1524,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
<string name="rendering_value__name">Par défaut</string>
<string name="rendering_value_highContrastRoads_name">Routes avec fort contraste</string>
<string name="specified_directiory_not_writeable">Impossible de créer les cartes dans le dossier spécifié</string>
<string name="copying_osmand_file_failed">Échec lors de la copie des fichiers</string>
<string name="copying_osmand_file_failed">Échec lors du déplacement des fichiers</string>
<string name="storage_directory_external">Stockage externe</string>
<string name="storage_directory_multiuser">Stockage multi-utilisateurs</string>
<string name="storage_directory_internal_app">Mémoire interne de l\'application</string>
@ -1532,7 +1532,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
<string name="storage_directory_default">Mémoire interne</string>
<string name="storage_directory">Stockage de la carte</string>
<string name="shared_string_copy">Copier</string>
<string name="application_dir_change_warning3">Copier les fichiers vers la nouvelle destination ?</string>
<string name="application_dir_change_warning3">Déplacer les fichiers de données vers la nouvelle destination \?</string>
<string name="rendering_attr_hideHouseNumbers_name">Numérotation des bâtiments</string>
<string name="routing_attr_avoid_borders_description">Éviter de franchir les frontières</string>
<string name="routing_attr_height_name">Limite de hauteur</string>
@ -1739,7 +1739,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
<string name="contact_us">Nous contacter</string>
<string name="osm_edit_created_poi">Point d\'intérêt créé sur OSM</string>
<string name="map_legend">Légende</string>
<string name="shared_string_upload">Téléchargement</string>
<string name="shared_string_upload">Téléversement</string>
<string name="shared_string_update">Mise à jour</string>
<string name="read_more">Lire plus</string>
<string name="whats_new">Quoi de neuf en version</string>
@ -2022,7 +2022,7 @@ Si vous appréciez OsmAnd et OSM et que vous souhaitez soutenir ces projets, c\'
<string name="osmand_plus_banner_desc">Téléchargements illimités des cartes, des mises à jour et des données pour le greffon Wikipédia.</string>
<string name="donation_to_osm">Don à la communauté OpenStreetMap</string>
<string name="osm_live_subscription_desc">L\'abonnement permet de bénéficier des mises à jour horaires, quotidiennes, hebdomadaires et de télécharger de nouvelles cartes sans limite.</string>
<string name="osm_live_payment_desc">Abonnement mensuel. Vous pouvez l\'annuler à tout moment sur Google Play.</string>
<string name="osm_live_payment_desc">Abonnement facturé chaque mois. Annulation possible à tout moment depuis Google Play.</string>
<string name="donation_to_osm_desc">Une partie de votre don sera reversée aux contributeurs OSM qui mettent à jour OpenStreetMap. Le coût de l\'abonnement reste identique.</string>
<string name="driving_region_australia">Australie</string>
<string name="lang_kab">Kabyle</string>
@ -2267,7 +2267,7 @@ représentant la zone : %1$s x %2$s</string>
\n
\nQuelques-unes des fonctionnalités :</string>
<string name="sea_depth_thanks">Merci d\'avoir acheté le greffon Lignes de sonde marines</string>
<string name="index_item_depth_contours_osmand_ext">Lignes de sonde marines</string>
<string name="index_item_depth_contours_osmand_ext">Isobathes</string>
<string name="index_item_depth_points_southern_hemisphere">Lignes de sonde marines pour l\'hémisphère sud</string>
<string name="index_item_depth_points_northern_hemisphere">Lignes de sonde marines pour l\'hémisphère nord</string>
<string name="download_depth_countours">Lignes de sonde marines</string>
@ -2709,10 +2709,10 @@ représentant la zone : %1$s x %2$s</string>
<string name="download_images">Télécharger les images</string>
<string name="purchase_dialog_title">Sélectionnez un abonnement</string>
<string name="purchase_dialog_subtitle">Sélectionnez l\'élément adapté :</string>
<string name="purchase_dialog_travel_description">Pour lire des articles de voyage hors ligne, achetez l\'un des éléments suivants :</string>
<string name="purchase_dialog_travel_description">Achetez l\'une des options suivantes pour obtenir la fonctionnalité guide de voyage hors ligne :</string>
<string name="wikivoyage_travel_guide_descr">Guides des lieux les plus intéressants au monde depuis OsmAnd et sans connexion Internet.</string>
<string name="wikivoyage_travel_guide">Guides de voyage</string>
<string name="in_app_purchase">Achat via l\'application</string>
<string name="in_app_purchase">Achat depuis l\'application</string>
<string name="in_app_purchase_desc">Paiement en une fois</string>
<string name="purchase_unlim_title">Acheter - %1$s</string>
<string name="purchase_subscription_title">Souscrire - %1$s</string>
@ -2734,7 +2734,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="start_editing">Démarrer les modifications</string>
<string name="get_unlimited_access">Obtenir un accès illimité</string>
<string name="welcome_to_open_beta">Bienvenue dans cette bêta ouverte !</string>
<string name="contour_lines_hillshade_maps">Cartes avec courbes de niveaux et ombrages du relief</string>
<string name="contour_lines_hillshade_maps">Cartes avec courbes de niveaux et ombrage du relief</string>
<string name="download_wikipedia_description">Téléchargez les articles Wikipedia pour %1$s afin de pouvoir les lire hors-ligne.</string>
<string name="download_wikipedia_label">Télécharger les données Wikipedia</string>
<string name="open_in_browser_wiki">Ouvrir l\'article en ligne</string>
@ -2970,8 +2970,8 @@ représentant la zone : %1$s x %2$s</string>
\n• Correction des plantages sur les arrêts de transports publics
\n• Pour la version gratuite : retrait des analyses Facebook et Firebase (c\'était déjà le cas pour OsmAnd+).</string>
<string name="shared_string_degrees">Degrés</string>
<string name="shared_string_milliradians">Millièmes angulaires</string>
<string name="angular_measeurement">Unités de mesure d\'angle</string>
<string name="shared_string_milliradians">Milliradians</string>
<string name="angular_measeurement">Unité d\'angle</string>
<string name="angular_measeurement_descr">Modifier l\'unité de mesure de l\'azimut.</string>
<string name="routing_attr_avoid_tram_name">Éviter le tram</string>
<string name="routing_attr_avoid_tram_description">Éviter le tram</string>
@ -2997,4 +2997,16 @@ représentant la zone : %1$s x %2$s</string>
<string name="routing_attr_avoid_bus_description">Éviter le bus et le trolleybus</string>
<string name="routing_attr_avoid_sett_name">Éviter les pavés</string>
<string name="routing_attr_avoid_sett_description">Éviter les pavés</string>
<string name="files_moved">%1$d fichiers déplacés (%2$s).</string>
<string name="files_copied">%1$d fichiers copiés (%2$s).</string>
<string name="files_failed">Impossible de copier %1$d fichiers (%2$s).</string>
<string name="files_present">%1$d fichiers (%2$s) sont présents à l\'emplacement précédent \'%3$s\'.</string>
<string name="move_maps">Déplacer les cartes</string>
<string name="dont_move_maps">Ne pas déplacer</string>
<string name="public_transport_ped_route_title">L\'itinéraire piéton est approximativement de %1$s et peut-être plus rapide qu\'en transport public.</string>
<string name="public_transport_no_route_title">Malheureusement OsmAnd n\'a pas trouvé d\'itinéraire avec les paramètres courants.</string>
<string name="public_transport_try_ped">Essayez l\'itinéraire piéton.</string>
<string name="public_transport_try_change_settings">Essayez de modifier les paramètres.</string>
<string name="public_transport_calc_pedestrian">Calculer l\'itinéraire piéton</string>
<string name="public_transport_type">Type de transport</string>
</resources>

10
OsmAnd/res/values-gl/phrases.xml
View file

@ -405,7 +405,7 @@
<string name="poi_camera">Cámaras e lentes</string>
<string name="poi_fashion">Tenda de moda</string>
<string name="poi_music">Tenda de música</string>
<string name="poi_optician">Optometría</string>
<string name="poi_optician">Óptica</string>
<string name="poi_tyres">Tenda de rodas</string>
<string name="poi_watches">Reloxaría</string>
<string name="poi_games">Xogos</string>
@ -770,7 +770,7 @@
<string name="poi_greengrocer">Froitaría</string>
<string name="poi_confectionery">Dozaría ou confeitaría</string>
<string name="poi_pastry">Confeitaría</string>
<string name="poi_vending_machine">Máquina vendedora</string>
<string name="poi_vending_machine">Máquina expendedora</string>
<string name="poi_baby_goods">Produtos de bebés</string>
<string name="poi_furnace">Tenda de calefacción</string>
<string name="poi_garden_furniture">Mobiliario do xardín</string>
@ -1087,7 +1087,7 @@
<string name="poi_shop_yes">Tenda xeral</string>
<string name="poi_hearing_aids">Aparellos auditivos</string>
<string name="poi_herbalist">Herboristaría</string>
<string name="poi_hifi">Tenda de alta fidelidade</string>
<string name="poi_hifi">Tenda de equipos de audio</string>
<string name="poi_houseware">Tenda de artigos domésticos</string>
<string name="poi_outdoor">Tenda de actividades ó ar libre</string>
<string name="poi_ship_chandler">Fornecedor de navíos</string>
@ -3571,4 +3571,8 @@
<string name="poi_flare">Chama de gas;Queimadura de facho</string>
<string name="poi_change_delete">Obxecto eliminado</string>
<string name="poi_health_specialty_radiotherapy_yes">Radioterapia</string>
<string name="poi_climbing_crag_filter">Penedo de escalada</string>
<string name="poi_climbing_crag">Si</string>
<string name="reddit">Reddit</string>
<string name="poi_rescue_box">Caixa de rescate</string>
</resources>

46
OsmAnd/res/values-gl/strings.xml
View file

@ -339,8 +339,8 @@
<string name="use_magnetic_sensor_descr">Para a lectura do compás, emprega o sensor magnético no canto do sensor da orientación.</string>
<string name="use_magnetic_sensor">Empregar o sensor magnético</string>
<string name="other_location">Outra</string>
<string name="files_limit">Fican %1$d ficheiros</string>
<string name="available_downloads_left">Aínda fican %1$d ficheiros para baixar</string>
<string name="files_limit">Quedan %1$d ficheiros</string>
<string name="available_downloads_left">Aínda quedan %1$d ficheiros para baixar</string>
<string name="install_paid">Versión completa</string>
<string name="cancel_route">Rexeitar rota</string>
<string name="cancel_navigation">Para-la navigación</string>
@ -474,11 +474,11 @@
<string name="replace_destination_point">Substituí-lo destino</string>
<string name="new_destination_point_dialog">Xa existe un destino:</string>
<string name="shared_string_target_points">Destinos</string>
<string name="intermediate_point_too_far">O destino intermedio %1$s está demasiado lonxe da estrada máis preta.</string>
<string name="intermediate_point_too_far">O destino intermedio %1$s está demasiado lonxe da estrada máis próxima.</string>
<string name="arrived_at_intermediate_point">Destino intermedio acadado</string>
<string name="context_menu_item_intermediate_point">Engadir un destino intermedio</string>
<string name="map_widget_intermediate_distance">Destino intermedio</string>
<string name="ending_point_too_far">O derradeiro punto está moi lonxe da estrada máis preta.</string>
<string name="ending_point_too_far">O derradeiro punto está moi lonxe da estrada máis próxima.</string>
<string name="add_tag">Engadir unha etiqueta</string>
<string name="btn_advanced_mode">Modo avanzado…</string>
<string name="poi_filter_parking">Aparcamento</string>
@ -620,7 +620,7 @@
<string name="native_app_allocated_memory_descr">A memoria nativa total empregada polo aplicativo é %1$s MB (Dalvik %2$s MB, outros %3$s MB).
\nMemoria proporcional %4$s MB (O límite do Android é %5$s MB, Dalvik %6$s MB).</string>
<string name="native_app_allocated_memory">Memoria nativa total</string>
<string name="starting_point_too_far">O punto de comezo está demasiado lonxe da estrada máis preta.</string>
<string name="starting_point_too_far">O punto de comezo está demasiado lonxe da estrada máis próxima.</string>
<string name="shared_location">Localización partillada ou compartida</string>
<string name="osmand_parking_event">Recolle-lo automóbil de onde está aparcado</string>
<string name="osmand_parking_warning">Aviso</string>
@ -961,7 +961,7 @@
<string name="incomplete_locale">incompleto</string>
<string name="shared_string_next">Seguinte</string>
<string name="shared_string_previous">Anterior</string>
<string name="unit_of_length_descr">Muda a distancia da medición.</string>
<string name="unit_of_length_descr">Muda en que unidades se mide a distancia.</string>
<string name="unit_of_length">Unidades da lonxitude</string>
<string name="si_mi_feet">Millas/pés</string>
<string name="si_mi_yard">Millas/iardas</string>
@ -1482,9 +1482,9 @@
<string name="shared_string_show_details">Amosar detalles</string>
<string name="rendering_value_disabled_name">Desactivado</string>
<string name="rendering_attr_hideHouseNumbers_name">Números dos edificios</string>
<string name="application_dir_change_warning3">Desexas que o OsmAnd copie tamén os teus ficheiros de datos ó novo destino\?</string>
<string name="application_dir_change_warning3">Desexas mover os ficheiros de datos de OsmAnd ó novo destino\?</string>
<string name="specified_directiory_not_writeable">Non foi posíbel crear os mapas no directorio indicado</string>
<string name="copying_osmand_file_failed">Fallou o copiado dos ficheiros</string>
<string name="copying_osmand_file_failed">Non se puideron mover os ficheiros</string>
<string name="storage_directory_external">Almacenaxe externo</string>
<string name="storage_directory_multiuser">Almacenaxe multiusuario</string>
<string name="storage_directory_internal_app">Memoria interna do aplicativo</string>
@ -1701,7 +1701,7 @@ Lon %2$s</string>
<string name="count_of_lines">Número de liñas</string>
<string name="are_you_sure">Tes a certeza de querer facelo\?</string>
<string name="unsaved_changes_will_be_lost">Vanse perde-las mudanzas non gardadas. Proseguer\?</string>
<string name="downloads_left_template">Fican %1$s baixadas</string>
<string name="downloads_left_template">Quedan %1$s baixadas</string>
<string name="roads">Estradas</string>
<string name="downloading_number_of_files">Estase a baixar - ficheiro %1$d</string>
<string name="buy">Mercar</string>
@ -2390,7 +2390,7 @@ Lon %2$s</string>
<string name="south_abbreviation">S</string>
<string name="north_abbreviation">N</string>
<string name="optional_point_name">Nome do punto opcional</string>
<string name="transport_nearby_routes_within">Liñas pretas a menos dos</string>
<string name="transport_nearby_routes_within">Liñas próximas a menos dos</string>
<string name="transport_nearby_routes">Preto dos</string>
<string name="enter_the_file_name">Insire o nome do ficheiro.</string>
<string name="map_import_error">Erro de importación de mapa</string>
@ -3045,13 +3045,15 @@ Lon %2$s</string>
<string name="routing_attr_avoid_subway_description">Evitar metros e tranvías/metros lixeiros</string>
<string name="routing_attr_avoid_ferry_name">Evitar ferris</string>
<string name="routing_attr_avoid_ferry_description">Evitar ferris</string>
<string name="release_3_3_7">• Amosar o tempo entre transbordos no transporte público
<string name="release_3_3_7">• Amosar o tempo entre transbordos no transporte público
\n
\n • Interface de usuario corrixida para «Detalles da rota»
\n
\n • Tema escuro solucionado no menú «Dirección» e «Detalles da rota»
\n
\n • Visualización de medida «azimut» en «Medir distancia»
\n
\n • Interface de usuario corrixida para «Detalles da rota»
\n
\n • Tema escuro solucionado no menú «Dirección» e «Detalles da rota»
\n
\n • Visualización de medida «azimut» en «Medir distancia»</string>
\n</string>
<string name="shared_string_degrees">Graos</string>
<string name="shared_string_milliradians">Milirradiáns</string>
<string name="angular_measeurement">Unidades de medición angular</string>
@ -3062,4 +3064,16 @@ Lon %2$s</string>
<string name="routing_attr_avoid_sett_name">Evitar o pavemento empedrado e lastros</string>
<string name="routing_attr_avoid_sett_description">Evita as rúas empedradas e con lastros</string>
<string name="send_log">Enviar rexistro (log)</string>
<string name="files_moved">%1$d ficheiros movidos (%2$s).</string>
<string name="files_copied">%1$d ficheiros copiados (%2$s).</string>
<string name="files_failed">Non se puideron copiar %1$d ficheiros (%2$s).</string>
<string name="files_present">%1$d ficheiros (%2$s) están presentes na localización anterior \"%3$s\".</string>
<string name="move_maps">Mover mapas</string>
<string name="dont_move_maps">Non mover</string>
<string name="public_transport_ped_route_title">A ruta a pé é de aproximadamente %1$s e pode que sexa máis rápida que no transporte público</string>
<string name="public_transport_no_route_title">Por desgraza, OsmAnd non puido atopar unha ruta adecuada para a túa configuración.</string>
<string name="public_transport_try_ped">Inténtao coa navegación a pé.</string>
<string name="public_transport_try_change_settings">Proba a cambiar os axustes.</string>
<string name="public_transport_calc_pedestrian">Calcular a ruta a pé</string>
<string name="public_transport_type">Tipo de transporte</string>
</resources>

18
OsmAnd/res/values-he/strings.xml
View file

@ -1937,9 +1937,9 @@
<string name="rendering_value_walkingRoutesScopeOSMC_name">צבע לפי שיוך לרשת</string>
<string name="shared_string_logoff">יציאה</string>
<string name="rendering_attr_hideHouseNumbers_name">מספרי בתים</string>
<string name="application_dir_change_warning3">להעתיק את קובצי הנתונים של OsmAnd ליעד החדש?</string>
<string name="application_dir_change_warning3">להעביר את קובצי הנתונים של OsmAnd ליעד החדש\?</string>
<string name="specified_directiory_not_writeable">לא ניתן ליצור מפות בתיקייה שצוינה</string>
<string name="copying_osmand_file_failed">העתקת הקבצים נכשלה</string>
<string name="copying_osmand_file_failed">העברת הקבצים נכשלה</string>
<string name="storage_directory_external">אחסון חיצוני</string>
<string name="storage_directory_multiuser">אחסון למגוון משתמשים</string>
<string name="storage_directory_internal_app">זיכרון פנימי של היישומון</string>
@ -2997,7 +2997,7 @@
<string name="quick_action_day_night_mode">מצב %s</string>
<string name="shared_string_degrees">מעלות</string>
<string name="shared_string_milliradians">מילי־רדיאנים</string>
<string name="angular_measeurement">יחידות מידה זוויתיות</string>
<string name="angular_measeurement">יחידה זוויתית</string>
<string name="angular_measeurement_descr">החלפת יחידת המידה לאזימוט.</string>
<string name="routing_attr_avoid_sett_name">הימנעות מריצוף חלוקי נחל ואבנים משתלבות</string>
<string name="routing_attr_avoid_sett_description">הימנעות מריצוף חלוקי נחל ואבנים משתלבות</string>
@ -3022,4 +3022,16 @@
\n • הצגת אזימוט במדידת מרחק
\n</string>
<string name="send_log">שליחת יומן</string>
<string name="files_moved">הועברו %1$d קבצים (%2$s).</string>
<string name="files_copied">הועתקו %1$d קבצים (%2$s).</string>
<string name="files_failed">העתקתם של %1$d קבצים נכשלה (%2$s).</string>
<string name="files_present">%1$d קבצים (%2$s) נמצאים במיקום הקודם ‚%3$s’.</string>
<string name="move_maps">להעביר מפות</string>
<string name="dont_move_maps">לא להעביר</string>
<string name="public_transport_ped_route_title">זמן ההגעה בהליכה הוא בערך %1$s וייתכן שתחבורה ציבורית תקצר אותו</string>
<string name="public_transport_no_route_title">לרוע המזל, OsmAnd לא הצליח למצוא מסלול שמתאים להגדרות שלך.</string>
<string name="public_transport_try_ped">מוטב לנסות ניווט להולכי רגל.</string>
<string name="public_transport_try_change_settings">מוטב לנסות לשנות את ההגדרות.</string>
<string name="public_transport_calc_pedestrian">חישוב מסלול להולכי רגל</string>
<string name="public_transport_type">סוג תחבורה</string>
</resources>

26
OsmAnd/res/values-hu/strings.xml
View file

@ -1532,7 +1532,7 @@ Hosszúság: %2$s</string>
<string name="filter_poi_hint">Szűrés név szerint</string>
<string name="search_poi_category_hint">Gépelj az összes kereséséhez</string>
<string name="specified_directiory_not_writeable">A térképeket nem sikerült létrehozni a megadott könyvtárban</string>
<string name="copying_osmand_file_failed">A fájlok másolása sikertelen</string>
<string name="copying_osmand_file_failed">A fájlok áthelyezése sikertelen</string>
<string name="storage_directory_external">Külső tároló</string>
<string name="storage_directory_multiuser">Többfelhasználós tároló</string>
<string name="storage_directory_internal_app">Belső alkalmazás-memória</string>
@ -1543,7 +1543,7 @@ Hosszúság: %2$s</string>
<string name="rendering_value__name">Alapértelmezett</string>
<string name="rendering_value_highContrastRoads_name">Nagy kontrasztú utak</string>
<string name="index_name_netherlands">Európa – Hollandia</string>
<string name="application_dir_change_warning3">Az OsmAnd adatfájljait másoljuk az új helyre?</string>
<string name="application_dir_change_warning3">Az OsmAnd adatfájljait áthelyezzük az új helyre\?</string>
<string name="rendering_attr_hideHouseNumbers_name">Házszámok</string>
<string name="routing_attr_avoid_borders_description">Országhatár átlépésének elkerülése</string>
<string name="routing_attr_height_name">Magasságkorlátozás</string>
@ -2985,4 +2985,26 @@ Kérlek adj meg egy teljes kódot</string>
<string name="rendering_attr_undefined_name">Meghatározatlan</string>
<string name="routing_attr_avoid_sett_name">Macskakő és kavicsburkolat elkerülése</string>
<string name="routing_attr_avoid_sett_description">Macskakő és kavicsburkolat elkerülése</string>
<string name="files_moved">%1$d fájl áthelyezve (%2$s).</string>
<string name="files_copied">%1$d fájl átmásolva (%2$s).</string>
<string name="files_failed">%1$d fájl másolása nem sikerült (%2$s).</string>
<string name="files_present">%1$d fájl (%2$s) megtalálható az előző helyen: \'%3$s\'.</string>
<string name="move_maps">Térképek áthelyezése</string>
<string name="dont_move_maps">Ne mozogjon</string>
<string name="public_transport_ped_route_title">Az út gyalogosan körülbelül %1$s, vagyis valószínűleg gyorsabb, mint tömegközlekedéssel.</string>
<string name="public_transport_no_route_title">Az OsmAnd sajnos nem talál a beállításoknak megfelelő útvonalat.</string>
<string name="public_transport_try_ped">Próbálja meg a gyalogos navigációt.</string>
<string name="public_transport_try_change_settings">Próbálja meg módosítani a beállításokat.</string>
<string name="public_transport_calc_pedestrian">Gyalogos útvonal kiszámítása</string>
<string name="public_transport_type">Közlekedési mód</string>
<string name="send_log">Napló küldése</string>
<string name="release_3_3_7">• A tömegközlekedési átszállási idők megjelenítése
\n
\n • Javított felhasználói felület az útvonal részleteivel
\n
\n • Javított sötét téma az Irányok menüben és az Útvonal részleteinél
\n
\n • A távolságmérésnél a tájolás megjelenítése
\n
\n</string>
</resources>

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

@ -3566,4 +3566,5 @@
<string name="poi_climbing_crag_filter">Klifursvæði</string>
<string name="poi_rescue_box">Björgunarkassi</string>
<string name="poi_climbing_crag">Já</string>
<string name="reddit">Reddit</string>
</resources>

20
OsmAnd/res/values-is/strings.xml
View file

@ -803,8 +803,8 @@
<string name="lang_ms">Malasíska</string>
<string name="shared_string_import2osmand">Flytja inn í OsmAnd</string>
<string name="read_full_article">Lesa alla greinina (á netinu)</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Litur fer eftir netveitu</string>
<string name="copying_osmand_file_failed">Afritun skráa mistókst</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Litur fer eftir leiðakerfi</string>
<string name="copying_osmand_file_failed">Færsla skráa mistókst</string>
<string name="storage_directory_external">Ytri gagnageymsla</string>
<string name="storage_directory_multiuser">Fjölnotendageymsla</string>
<string name="storage_directory_internal_app">Innra minni forrita</string>
@ -1929,7 +1929,7 @@ Punktar</string>
<string name="restart_is_required">Til að breytingarnar verði að fullu virkar, þarf að endurræsa forritið handvirkt.</string>
<string name="lang_ber">Berberska</string>
<string name="gps_network_not_enabled">Staðsetningarþjónustan er ekki virk. Viltu kveikja á henni?</string>
<string name="application_dir_change_warning3">Afrita OsmAnd-gagnaskrárnar sínar á nýja áfangastaðinn?</string>
<string name="application_dir_change_warning3">Færa OsmAnd-gagnaskrárnar á nýja áfangastaðinn\?</string>
<string name="action_create">Aðgerðin útbúa</string>
<string name="action_modify">Aðgerðin breyta</string>
<string name="action_delete">Aðgerðin eyða</string>
@ -3017,7 +3017,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="routing_attr_avoid_sett_description">Forðast götusteina og steinlögn</string>
<string name="shared_string_degrees">Gráður</string>
<string name="shared_string_milliradians">Millíradíanar</string>
<string name="angular_measeurement">Mælieiningar horna</string>
<string name="angular_measeurement">Mælieining horna</string>
<string name="angular_measeurement_descr">Breyttu í hvaða einingum áttarhorn (hæð) er mælt.</string>
<string name="routing_attr_avoid_tram_name">Forðast sporvagna</string>
<string name="routing_attr_avoid_tram_description">Forðast sporvagna</string>
@ -3041,4 +3041,16 @@ Stendur fyrir svæði: %1$s x %2$s</string>
\n
\n</string>
<string name="send_log">Senda atvikaskrá</string>
<string name="files_moved">Færði %1$d skrár (%2$s).</string>
<string name="files_copied">Afritaði %1$d skrár (%2$s).</string>
<string name="files_failed">Mistókst að afrita %1$d skrár (%2$s).</string>
<string name="files_present">%1$d skrár (%2$s) eru til staðar á fyrri staðsetningunni \'%3$s\'.</string>
<string name="move_maps">Flytja kort</string>
<string name="dont_move_maps">Ekki flytja</string>
<string name="public_transport_ped_route_title">Leiðin er um það bil %1$s fótgangandi og gæti verið fljótfarnari þannig heldur en með almenningssamgöngum</string>
<string name="public_transport_no_route_title">Því miður gat OsmAnd ekki fundið hentuga leið miðað við stillingarnar þínar.</string>
<string name="public_transport_try_ped">Prófaðu leiðsögn fyrir fótgangandi.</string>
<string name="public_transport_try_change_settings">Prófaðu að breyta stillingunum.</string>
<string name="public_transport_calc_pedestrian">Reikna leið fyrir fótgangandi</string>
<string name="public_transport_type">Tegund samgangna</string>
</resources>

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

@ -1525,7 +1525,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
<string name="filter_poi_hint">Filtra per nome</string>
<string name="search_poi_category_hint">Scrivi per cercare</string>
<string name="index_name_netherlands">Europa - Paesi Bassi</string>
<string name="copying_osmand_file_failed">Copia dei file fallita</string>
<string name="copying_osmand_file_failed">Spostamento dei file fallita</string>
<string name="storage_directory_external">Memoria esterna</string>
<string name="application_dir_change_warning3">Copiare i file dei dati OsmAnd nella nuova destinazione\?</string>
<string name="specified_directiory_not_writeable">Le mappe non possono essere create nella destinazione specificata</string>
@ -2206,7 +2206,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="points_delete_multiple_succesful">Punti cancellati.</string>
<string name="points_delete_multiple">Stai cancellando %1$d punto(i). Confermi?</string>
<string name="route_points_category_name">Svolte di questo percorso</string>
<string name="track_points_category_name">Punti di passaggio, punti di interesse, caratteristiche notevoli</string>
<string name="track_points_category_name">Punti di passaggio, punti di interesse, caratteristiche con un nome</string>
<string name="shared_string_gpx_track">Traccia</string>
<string name="max_speed">Velocità massima</string>
<string name="add_new_folder">Aggiungi una nuova cartella</string>
@ -3015,4 +3015,17 @@ Rappresenta l\'area: %1$s x %2$s</string>
\n• Visualizza l’azimut nella misura della distanza.
\n
\n</string>
<string name="files_moved">Spostato %1$d files (%2$s).</string>
<string name="files_copied">Copiati %1$d files (%2$s).</string>
<string name="files_failed">Fallita la copia di %1$d files (%2$s).</string>
<string name="files_present">%1$d files (%2$s) sono presenti nella precedente posizione \'%3$s\'.</string>
<string name="move_maps">Sposta le mappe</string>
<string name="dont_move_maps">Non spostare</string>
<string name="public_transport_ped_route_title">Il percorso a piedi è circa %1$s e poterebbe essere più veloce di quello con i mezzi pubblici</string>
<string name="public_transport_no_route_title">Sfortunatamente, OsmAnd non può individuare un percorso compatibile alle tue impostazioni.</string>
<string name="public_transport_try_ped">Prova la navigazione per pedoni.</string>
<string name="public_transport_try_change_settings">Prova cambiando le impostazioni.</string>
<string name="public_transport_calc_pedestrian">Calcola un percorso per pedoni</string>
<string name="public_transport_type">Modalità di trasporto</string>
<string name="send_log">Invia il registro</string>
</resources>

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

@ -2680,7 +2680,7 @@ POIの更新は利用できません</string>
<string name="travel_card_download_descr">Wikivoyageの旅行ガイドを事前にダウンロードすれば、インターネット接続なしで世界各地の観光場所を知ることができます。</string>
<string name="start_editing_card_image_text">誰でも自由に編集できる世界規模の旅行ガイドです。</string>
<string name="welcome_to_open_beta_description">『旅行ガイド』はWikivoyageをベースとした機能です。オープンβ時に限り無料で全ての機能を利用できます。旅行ガイドは将来的にOsmAndのサブスクライブ登録者や、OsmAnd+の利用者に提供される予定です。</string>
<string name="start_editing_card_description">あなたもWikivoyageの記事を編集できます。場所に関する知識、旅先での経験、魅力あるスポットはもちろん注意事項なども共有できます</string>
<string name="start_editing_card_description">あなたもWikivoyageの記事を編集できます。場所に関する知識、旅先での経験、魅力あるスポットはもちろん注意事項なども共有できます。</string>
<string name="start_editing">編集を開始</string>
<string name="get_unlimited_access">制限のないアクセス権の取得</string>
<string name="wikivoyage_travel_guide">旅行ガイド</string>

Some files were not shown because too many files have changed in this diff Show more