Compare commits

..

1 Commits

Author SHA1 Message Date
Jean-Baptiste
a201ff395d Update copyright of the project
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
2025-12-30 18:31:14 +01:00
23 changed files with 34 additions and 11 deletions

2
NOTICE
View File

@@ -1,6 +1,6 @@
Copyright 2020 My.com B.V. (Mail.Ru Group) Copyright 2020 My.com B.V. (Mail.Ru Group)
Copyright 2025 Organic Maps Contributors Copyright 2025 Organic Maps Contributors
Copyright 2025 CoMaps Contributors Copyright 2026 CoMaps Contributors
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

View File

@@ -22,9 +22,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:baselineAligned="false" android:orientation="vertical"
android:orientation="horizontal"
tools:ignore="ScrollViewSize"> tools:ignore="ScrollViewSize">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -108,5 +111,6 @@
android:text="@string/register_at_openstreetmap" /> android:text="@string/register_at_openstreetmap" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/navigation_frame" android:id="@+id/navigation_frame"
@@ -42,4 +42,4 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="bottom|start" android:layout_gravity="bottom|start"
android:background="?cardBackground"/> android:background="?cardBackground"/>
</merge> </FrameLayout>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/navigation_frame" android:id="@+id/navigation_frame"
@@ -41,4 +41,4 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="bottom|center" android:layout_gravity="bottom|center"
android:background="?cardBackground"/> android:background="?cardBackground"/>
</merge> </FrameLayout>

View File

@@ -146,13 +146,16 @@
android:foreground="@drawable/shadow_top" android:foreground="@drawable/shadow_top"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
<LinearLayout <RelativeLayout
android:id="@+id/driving_options_btn" android:id="@+id/driving_options_btn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:gravity="center" android:gravity="center"
android:minHeight="@dimen/height_block_base"> android:minHeight="@dimen/height_block_base">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/driving_options_btn_img" android:id="@+id/driving_options_btn_img"
android:layout_width="@dimen/margin_base_plus" android:layout_width="@dimen/margin_base_plus"
@@ -171,7 +174,8 @@
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/text_light" android:textColor="@color/text_light"
tools:text="test" /> tools:text="test" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
style="@style/MwmWidget.FrameLayout.Elevation" style="@style/MwmWidget.FrameLayout.Elevation"

View File

@@ -923,6 +923,7 @@
<string name="advanced">Avançat</string> <string name="advanced">Avançat</string>
<string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string> <string name="download_resources_custom_url_title">Servidor de Mapes Personalitzat</string>
<string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string> <string name="download_resources_custom_url_message">Sobreescriu el servidor de descàrrega de mapes per defecte. Deixa en blanc per a emprar el servidor per defecte de CoMaps.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">No establert</string> <string name="download_resources_custom_url_summary_none">No establert</string>
<string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string> <string name="download_resources_custom_url_error_scheme">Per favor introdueix una URL completa que comence amb https:// i acabe amb /</string>
</resources> </resources>

View File

@@ -915,6 +915,7 @@
<string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string> <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
<string name="download_resources_custom_url_title">Vlastní mapový server</string> <string name="download_resources_custom_url_title">Vlastní mapový server</string>
<string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string> <string name="download_resources_custom_url_message">Přepsat výchozí server používaný ke stahování map. Nechte pole prázdné, pokud chcete použít výchozí server CoMaps.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string> <string name="download_resources_custom_url_error_scheme">Zadejte prosím celou adresu URL začínající na https:// a končící s /</string>
<string name="advanced">Pokročilé</string> <string name="advanced">Pokročilé</string>
<string name="download_resources_custom_url_summary_none">Není nastaveno</string> <string name="download_resources_custom_url_summary_none">Není nastaveno</string>

View File

@@ -920,4 +920,5 @@
<string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string> <string name="download_resources_custom_url_summary_none">Nicht konfiguriert</string>
<string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string> <string name="download_resources_custom_url_message">Standardserver für Kartendownloads überschreiben. Leer lassen, um den CoMaps-Standardserver zu nutzen.</string>
<string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string> <string name="download_resources_custom_url_error_scheme">Bitte eine vollständige URL eingeben, die mit https:// beginnt und mit / endet</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
</resources> </resources>

View File

@@ -927,4 +927,5 @@
<string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Deja en blanco para usar el servidor de CoMaps por defecto.</string> <string name="download_resources_custom_url_message">Sobreescribe el servidor de mapas por defecto. Deja en blanco para usar el servidor de CoMaps por defecto.</string>
<string name="download_resources_custom_url_summary_none">No establecido</string> <string name="download_resources_custom_url_summary_none">No establecido</string>
<string name="download_resources_custom_url_error_scheme">Por favor introduce un URL completo empezando con https:// y terminando con /</string> <string name="download_resources_custom_url_error_scheme">Por favor introduce un URL completo empezando con https:// y terminando con /</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
</resources> </resources>

View File

@@ -915,5 +915,6 @@
<string name="advanced">Täiendavad seadistused</string> <string name="advanced">Täiendavad seadistused</string>
<string name="download_resources_custom_url_title">Sinu oma kaardiserver</string> <string name="download_resources_custom_url_title">Sinu oma kaardiserver</string>
<string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string> <string name="download_resources_custom_url_message">Kui tahad kasutada oma kaardiserverit, siis lisa ta siia. CoMapsi vaikimisi serveri kasutamiseks jäta tühjaks.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string> <string name="download_resources_custom_url_error_scheme">Palun sisesta täismahuline võrguaadress, mille alguses on https:// ja lõpus /</string>
</resources> </resources>

View File

@@ -923,6 +923,7 @@
<string name="navigation_start_tts_disabled_message">Instructions vocales désactivées : moteur de synthèse vocale non disponible</string> <string name="navigation_start_tts_disabled_message">Instructions vocales désactivées : moteur de synthèse vocale non disponible</string>
<string name="advanced">Avancé</string> <string name="advanced">Avancé</string>
<string name="download_resources_custom_url_summary_none">Non défini</string> <string name="download_resources_custom_url_summary_none">Non défini</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string> <string name="download_resources_custom_url_title">Serveur de cartes personnalisé</string>
<string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète débutant par https:// et se terminant par /</string> <string name="download_resources_custom_url_error_scheme">Veuillez saisir une URL complète débutant par https:// et se terminant par /</string>
<string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string> <string name="download_resources_custom_url_message">Serveur pour télécharger les cartes. Laissez vide pour utiliser le serveur par défaut CoMaps.</string>

View File

@@ -908,6 +908,7 @@
<string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string> <string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string>
<string name="download_resources_custom_url_error_scheme">Aggiungere un URL che inizia con https:// e finisce con /</string> <string name="download_resources_custom_url_error_scheme">Aggiungere un URL che inizia con https:// e finisce con /</string>
<string name="download_resources_custom_url_summary_none">Non impostato</string> <string name="download_resources_custom_url_summary_none">Non impostato</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_message">Sovrascrivi il server da cui scaricare le mappe. Lascia vuoto per usare i server default di CoMaps.</string> <string name="download_resources_custom_url_message">Sovrascrivi il server da cui scaricare le mappe. Lascia vuoto per usare i server default di CoMaps.</string>
<string name="download_resources_custom_url_title">Server mappe personalizzato</string> <string name="download_resources_custom_url_title">Server mappe personalizzato</string>
<string name="advanced">Avanzate</string> <string name="advanced">Avanzate</string>

View File

@@ -899,6 +899,7 @@
<string name="advanced">Kita</string> <string name="advanced">Kita</string>
<string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string> <string name="download_resources_custom_url_title">Pasirinktinis žemėlapių serveris</string>
<string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string> <string name="download_resources_custom_url_message">Žemėlapiams parsisiųsti galite nurodyti kitą, nei numatytasis, serverį. Palikite lauką tuščią, jei norite naudoti numatytąjį „CoMaps“ serverį.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">Nenurodytas</string> <string name="download_resources_custom_url_summary_none">Nenurodytas</string>
<string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string> <string name="download_resources_custom_url_error_scheme">Įveskite visą URL adresą, pradedant „https://“ ir baigiant „/“</string>
</resources> </resources>

View File

@@ -853,6 +853,7 @@
<string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string> <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
<string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string> <string name="prefs_speed_cameras_information">Brīdinājumi par ātruma noteikšanas kamerā ir atspējoti valstīs, kurās šādus brīdinājumus aizliedz vietējais likums.</string>
<string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string> <string name="navigation_start_tts_message">"Uzsāk navigāciju, balss norāžu valoda: "</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">Nav iestatīts</string> <string name="download_resources_custom_url_summary_none">Nav iestatīts</string>
<string name="download_resources_custom_url_error_scheme">Lūgums ievadīt pilnu URL, kas sākas ar https:// un beidzas ar /</string> <string name="download_resources_custom_url_error_scheme">Lūgums ievadīt pilnu URL, kas sākas ar https:// un beidzas ar /</string>
<string name="advanced">Iestatījumi: izvērsta kopa</string> <string name="advanced">Iestatījumi: izvērsta kopa</string>

View File

@@ -909,6 +909,7 @@
<string name="advanced">Avansert</string> <string name="advanced">Avansert</string>
<string name="download_resources_custom_url_summary_none">Ikke angitt</string> <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
<string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string> <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string> <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
<string name="download_resources_custom_url_title">Tilpasset kartserver</string> <string name="download_resources_custom_url_title">Tilpasset kartserver</string>
</resources> </resources>

View File

@@ -918,6 +918,7 @@
<string name="advanced">Geavanceerd</string> <string name="advanced">Geavanceerd</string>
<string name="download_resources_custom_url_title">Aangepaste server voor kaarten</string> <string name="download_resources_custom_url_title">Aangepaste server voor kaarten</string>
<string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string> <string name="download_resources_custom_url_message">Overschrijf de standaard kaartdownloadserver die wordt gebruikt voor kaartdownloads. Laat leeg om de standaardserver van CoMaps te gebruiken.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">Niet ingesteld</string> <string name="download_resources_custom_url_summary_none">Niet ingesteld</string>
<string name="download_resources_custom_url_error_scheme">Voer een volledige URL in, beginnend met https:// en eindigend met /</string> <string name="download_resources_custom_url_error_scheme">Voer een volledige URL in, beginnend met https:// en eindigend met /</string>
</resources> </resources>

View File

@@ -912,6 +912,7 @@
<string name="advanced">Avançadas</string> <string name="advanced">Avançadas</string>
<string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string> <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
<string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string> <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">Indefinido</string> <string name="download_resources_custom_url_summary_none">Indefinido</string>
<string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string> <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
</resources> </resources>

View File

@@ -662,4 +662,5 @@
<string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string> <string name="download_resources_custom_url_message">Prepiši privzeti strežnik za prenos zemljevidov, ki se uporablja za prenos zemljevidov. Pustite prazno, če želite uporabiti privzeti strežnik CoMaps.</string>
<string name="download_resources_custom_url_summary_none">Ni nastavljeno</string> <string name="download_resources_custom_url_summary_none">Ni nastavljeno</string>
<string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string> <string name="download_resources_custom_url_error_scheme">Prosimo, vnesite polni URL, ki se začne z https:// in konča z /</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
</resources> </resources>

View File

@@ -917,6 +917,7 @@
<string name="advanced">Напредно</string> <string name="advanced">Напредно</string>
<string name="download_resources_custom_url_title">Сопствени сервер мапа</string> <string name="download_resources_custom_url_title">Сопствени сервер мапа</string>
<string name="download_resources_custom_url_message">Замени подразумевани сервер за преузимање мапа који се користи за преузимања мапа. Оставите празно да бисте користили CoMaps сервер.</string> <string name="download_resources_custom_url_message">Замени подразумевани сервер за преузимање мапа који се користи за преузимања мапа. Оставите празно да бисте користили CoMaps сервер.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">Није постављено</string> <string name="download_resources_custom_url_summary_none">Није постављено</string>
<string name="download_resources_custom_url_error_scheme">Унесите пуну УРЛ адресу која почиње са https:// и која се завршава са /</string> <string name="download_resources_custom_url_error_scheme">Унесите пуну УРЛ адресу која почиње са https:// и која се завршава са /</string>
</resources> </resources>

View File

@@ -917,6 +917,7 @@
<string name="place_page_app_too_old_description">您当前的地图数据非常旧,请更新 CoMaps 应用。</string> <string name="place_page_app_too_old_description">您当前的地图数据非常旧,请更新 CoMaps 应用。</string>
<string name="place_page_update_too_old_map">更新地图区域</string> <string name="place_page_update_too_old_map">更新地图区域</string>
<string name="place_page_too_old_to_edit">由于地图数据太旧OpenStreetMap 编辑被禁用。</string> <string name="place_page_too_old_to_edit">由于地图数据太旧OpenStreetMap 编辑被禁用。</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">未设置</string> <string name="download_resources_custom_url_summary_none">未设置</string>
<string name="download_resources_custom_url_error_scheme">请输入以 https:// 开头、以 / 结尾的完整 URL</string> <string name="download_resources_custom_url_error_scheme">请输入以 https:// 开头、以 / 结尾的完整 URL</string>
<string name="advanced">高级</string> <string name="advanced">高级</string>

View File

@@ -105,5 +105,4 @@
<string name="count_label" translatable="false">× %d</string> <string name="count_label" translatable="false">× %d</string>
<string name="kw_label" translatable="false">%s kW</string> <string name="kw_label" translatable="false">%s kW</string>
<string name="phone_format" translatable="false">+ XX X XX XX XX</string> <string name="phone_format" translatable="false">+ XX X XX XX XX</string>
<string name="download_resources_custom_url_hint" translatable="false">https://cdn-fi-1.comaps.app/</string>
</resources> </resources>

View File

@@ -971,6 +971,7 @@
<!-- Custom Download URL --> <!-- Custom Download URL -->
<string name="download_resources_custom_url_title">Custom Map Server</string> <string name="download_resources_custom_url_title">Custom Map Server</string>
<string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string> <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
<string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
<string name="download_resources_custom_url_summary_none">Not set</string> <string name="download_resources_custom_url_summary_none">Not set</string>
<string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string> <string name="download_resources_custom_url_error_scheme">Please enter a full URL starting with https:// and ending with /</string>
</resources> </resources>

View File

@@ -1 +1 @@
© 2025 CoMaps Contributors © 2026 CoMaps Contributors