diff --git a/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml b/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml index d8cfc2311c..f15caca36d 100644 --- a/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml +++ b/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml @@ -127,7 +127,7 @@ android:textColor="@color/app_bar_title_light" android:textSize="@dimen/title_text_size" app:typeface="@string/font_roboto_mono_bold" - tools:text="@string/sharing_enabled" /> + tools:text="Sharing: Enabled" /> Compartición en segundu planu Dir a Axustes Más sero - Compartición: Activada + Compartición: %1$s + Activada Nun hai conexón al GPS Nun hai conexón a internet Amestar un preséu diff --git a/OsmAnd-telegram/res/values-be/strings.xml b/OsmAnd-telegram/res/values-be/strings.xml index 7402e1cd61..ec24835fb4 100644 --- a/OsmAnd-telegram/res/values-be/strings.xml +++ b/OsmAnd-telegram/res/values-be/strings.xml @@ -31,7 +31,8 @@ Пераадправіць звесткі аб месцазнаходжанні Апошняе даступнае месца "Статус абмену " - Абмен: Уключаны + Абмен: %1$s + Уключаны Статус Злучэнне з GPS адсутнічае Злучэнне з Інтэрнэтам адсутнічае diff --git a/OsmAnd-telegram/res/values-ca/strings.xml b/OsmAnd-telegram/res/values-ca/strings.xml index c74a22298a..8d73b20766 100644 --- a/OsmAnd-telegram/res/values-ca/strings.xml +++ b/OsmAnd-telegram/res/values-ca/strings.xml @@ -103,7 +103,8 @@ Torna a enviar la ubicació Última ubicació disponible Estat de la compartició - Compartició: activada + Compartició: %1$s + activada Estat No hi ha connexió GPS No hi ha connexió a internet diff --git a/OsmAnd-telegram/res/values-da/strings.xml b/OsmAnd-telegram/res/values-da/strings.xml index b9885f005d..9622866174 100644 --- a/OsmAnd-telegram/res/values-da/strings.xml +++ b/OsmAnd-telegram/res/values-da/strings.xml @@ -11,7 +11,8 @@ Send placering igen Sidste tilgængelige placering Delingsstatus - Deling: aktiveret + Deling: %1$s + aktiveret Status Ingen GPX-forbindelse Ingen internetforbindelse diff --git a/OsmAnd-telegram/res/values-de/strings.xml b/OsmAnd-telegram/res/values-de/strings.xml index 874de9c1d3..4f24ce6c68 100644 --- a/OsmAnd-telegram/res/values-de/strings.xml +++ b/OsmAnd-telegram/res/values-de/strings.xml @@ -6,7 +6,8 @@ Noch nicht gefunden Position neu senden Freigabestatus - Teilen: Aktiviert + Teilen: %1$s + Aktiviert Status Kein GPS-Signal Keine Internetverbindung diff --git a/OsmAnd-telegram/res/values-es-rUS/strings.xml b/OsmAnd-telegram/res/values-es-rUS/strings.xml index 2ea944204e..ad8d8bbcd3 100644 --- a/OsmAnd-telegram/res/values-es-rUS/strings.xml +++ b/OsmAnd-telegram/res/values-es-rUS/strings.xml @@ -11,7 +11,8 @@ Reenviar ubicación Última ubicación disponible Estado de compartición - Compartir: Activado + Compartir: %1$s + Activado Estado Sin conexión GPS Sin conexión a Internet diff --git a/OsmAnd-telegram/res/values-es/strings.xml b/OsmAnd-telegram/res/values-es/strings.xml index 7e3971e810..02936f3627 100644 --- a/OsmAnd-telegram/res/values-es/strings.xml +++ b/OsmAnd-telegram/res/values-es/strings.xml @@ -11,7 +11,8 @@ Reenviar ubicación Última ubicación disponible Estado de compartición - Compartir: Activado + Compartir: %1$s + Activado Estado Sin conexión GPS Sin conexión a Internet diff --git a/OsmAnd-telegram/res/values-fa/strings.xml b/OsmAnd-telegram/res/values-fa/strings.xml index 2528e3b201..08d3f38c1a 100644 --- a/OsmAnd-telegram/res/values-fa/strings.xml +++ b/OsmAnd-telegram/res/values-fa/strings.xml @@ -18,7 +18,6 @@ هنوز ارسال نشده هنوز پیدا نشده بازفرستی موقعیت - اشتراک‌گذاری: فعال وضعیت بستن نشان نده diff --git a/OsmAnd-telegram/res/values-gl/strings.xml b/OsmAnd-telegram/res/values-gl/strings.xml index 56fdf4ccdd..2980f14271 100644 --- a/OsmAnd-telegram/res/values-gl/strings.xml +++ b/OsmAnd-telegram/res/values-gl/strings.xml @@ -10,7 +10,8 @@ Voltar a enviar a ubicación Última ubicación dispoñíbel Estado do compartillamento - Compartillar: Activado + Compartillar: %1$s + Activado Estado Sen unha conexión GPS Sen unha conexión á Internet diff --git a/OsmAnd-telegram/res/values-he/strings.xml b/OsmAnd-telegram/res/values-he/strings.xml index f1299f8516..eac12ccfdd 100644 --- a/OsmAnd-telegram/res/values-he/strings.xml +++ b/OsmAnd-telegram/res/values-he/strings.xml @@ -35,7 +35,6 @@ שליחת המיקום מחדש המיקום האחרון הזמין מצב שיתוף - שיתוף: פעיל מצב אין חיבור ל־GPS אין חיבור לאינטרנט diff --git a/OsmAnd-telegram/res/values-hu/strings.xml b/OsmAnd-telegram/res/values-hu/strings.xml index 2fc99f7039..329446cb96 100644 --- a/OsmAnd-telegram/res/values-hu/strings.xml +++ b/OsmAnd-telegram/res/values-hu/strings.xml @@ -61,7 +61,8 @@ Tartózkodási hely elküldése újra Utolsó elérhető tartózkodási hely Megosztás állapota - Megosztás: engedélyezve + Megosztás: %1$s + engedélyezve Állapot Nincs GPS-kapcsolat Nincs internetkapcsolat diff --git a/OsmAnd-telegram/res/values-it/strings.xml b/OsmAnd-telegram/res/values-it/strings.xml index 0db22b6d9b..f0dccc4e44 100644 --- a/OsmAnd-telegram/res/values-it/strings.xml +++ b/OsmAnd-telegram/res/values-it/strings.xml @@ -31,7 +31,8 @@ Invia nuovamente la posizione Ultima posizione disponibile Condivisione dello stato - Condivisione: Attivata + Condivisione: %1$s + Attivata Stato Nessuna connessione GPS Nessuna connessione ad Internet diff --git a/OsmAnd-telegram/res/values-nb/strings.xml b/OsmAnd-telegram/res/values-nb/strings.xml index a10958c02c..ca5fe62dcc 100644 --- a/OsmAnd-telegram/res/values-nb/strings.xml +++ b/OsmAnd-telegram/res/values-nb/strings.xml @@ -11,7 +11,8 @@ Send posisjon på nytt Sist tilgjengelige posisjon Delingsstatus - Deling: Påslått + Deling: %1$s + Påslått Status Ingen GPS-tilkobling Ingen internettilknytning diff --git a/OsmAnd-telegram/res/values-nl/strings.xml b/OsmAnd-telegram/res/values-nl/strings.xml index aa316ff263..f8e2432000 100644 --- a/OsmAnd-telegram/res/values-nl/strings.xml +++ b/OsmAnd-telegram/res/values-nl/strings.xml @@ -67,7 +67,8 @@ Herzend locatie Laatst beschikbare locatie Delen status - Delen: Ingeschakeld + Delen: %1$s + Ingeschakeld Status Geen GPS verbinding Geen internet verbinding diff --git a/OsmAnd-telegram/res/values-oc/strings.xml b/OsmAnd-telegram/res/values-oc/strings.xml index b7280c789f..8508991d33 100644 --- a/OsmAnd-telegram/res/values-oc/strings.xml +++ b/OsmAnd-telegram/res/values-oc/strings.xml @@ -101,7 +101,8 @@ Tornar enviar lo posicion Darriera posicion disponibla Estat dau partatge - Partatge: activat + Partatge: %1$s + activat Estat Ges de connexion GPS Ges de connexion a l\'Internet diff --git a/OsmAnd-telegram/res/values-pl/strings.xml b/OsmAnd-telegram/res/values-pl/strings.xml index 4c4a5b62ee..42b4e28e44 100644 --- a/OsmAnd-telegram/res/values-pl/strings.xml +++ b/OsmAnd-telegram/res/values-pl/strings.xml @@ -11,7 +11,8 @@ Wyślij ponownie lokalizację Ostatnia dostępna lokalizacja Status udostępniania - Udostępnianie: Włączone + Udostępnianie: %1$s + Włączone Status Brak połączenia GPS Brak połączenia z internetem diff --git a/OsmAnd-telegram/res/values-pt-rBR/strings.xml b/OsmAnd-telegram/res/values-pt-rBR/strings.xml index 8133000cb5..f3f53526ac 100644 --- a/OsmAnd-telegram/res/values-pt-rBR/strings.xml +++ b/OsmAnd-telegram/res/values-pt-rBR/strings.xml @@ -36,7 +36,8 @@ Reenvie o local Última localização disponível Status de compartilhamento - Compartilhamento: Ativado + Compartilhamento: %1$s + Ativado Status Sem conexão GPS Sem conexão com a internet diff --git a/OsmAnd-telegram/res/values-pt-rPT/strings.xml b/OsmAnd-telegram/res/values-pt-rPT/strings.xml index 7e854f67e4..dd5980e383 100644 --- a/OsmAnd-telegram/res/values-pt-rPT/strings.xml +++ b/OsmAnd-telegram/res/values-pt-rPT/strings.xml @@ -165,7 +165,8 @@ Tem certeza de que deseja sair do OsmAnd Tracker para que você não possa compartilhar o local ou ver a localização de outras pessoas\? Servidor Metros por segundo - Compartilhamento: Ativado + Compartilhamento: %1$s + Ativado Por nome Posição Última resposta diff --git a/OsmAnd-telegram/res/values-pt/strings.xml b/OsmAnd-telegram/res/values-pt/strings.xml index 057637d09b..8b7b533119 100644 --- a/OsmAnd-telegram/res/values-pt/strings.xml +++ b/OsmAnd-telegram/res/values-pt/strings.xml @@ -109,7 +109,8 @@ Reenvie o local Última localização disponível Status de compartilhamento - Compartilhamento: Ativado + Compartilhamento: %1$s + Ativado Sem conexão GPS Sem conexão com a internet Desativar diff --git a/OsmAnd-telegram/res/values-ru/strings.xml b/OsmAnd-telegram/res/values-ru/strings.xml index 3ce6fbe095..a5a0a8f6b5 100644 --- a/OsmAnd-telegram/res/values-ru/strings.xml +++ b/OsmAnd-telegram/res/values-ru/strings.xml @@ -138,7 +138,8 @@ Отправить местоположение Последнее местоположение Статус отправки - Трансляция: включена + Трансляция: %1$s + включена Статус Отсутствует GPS Отсутствует интернет diff --git a/OsmAnd-telegram/res/values-sc/strings.xml b/OsmAnd-telegram/res/values-sc/strings.xml index e4a03d3549..ed418a1bec 100644 --- a/OsmAnd-telegram/res/values-sc/strings.xml +++ b/OsmAnd-telegram/res/values-sc/strings.xml @@ -67,7 +67,8 @@ Torra a imbiare sa positzione Ùrtima positzione disponìbile Istadu de cumpartzidura - Cumpartzidura: Abilitada + Cumpartzidura: %1$s + Abilitada Peruna connessione GPS Peruna connessione a ìnternet Annanghe unu dispositivu diff --git a/OsmAnd-telegram/res/values-sl/strings.xml b/OsmAnd-telegram/res/values-sl/strings.xml index 1ddfb7d387..1c919cada6 100644 --- a/OsmAnd-telegram/res/values-sl/strings.xml +++ b/OsmAnd-telegram/res/values-sl/strings.xml @@ -25,7 +25,8 @@ Ponovno pošiljanje trenutnega mesta Zadnje določeno mesto Objavljanje stanja - Objavljanje: omogočeno + Objavljanje: %1$s + omogočeno Stanje Ni povezave z GPS Ni vzpostavljene internetne povezave diff --git a/OsmAnd-telegram/res/values-uk/strings.xml b/OsmAnd-telegram/res/values-uk/strings.xml index 78891e80a0..862a9e741f 100644 --- a/OsmAnd-telegram/res/values-uk/strings.xml +++ b/OsmAnd-telegram/res/values-uk/strings.xml @@ -30,7 +30,8 @@ Повторно надіслати позицію Крайнє доступне позиціювання Стан трансляції - Трансляція: Увімкнута + Трансляція: %1$s + Увімкнута Статус Немає зʼєднання із GPS Немає зʼєднання із інтернетом diff --git a/OsmAnd-telegram/res/values-zh-rTW/strings.xml b/OsmAnd-telegram/res/values-zh-rTW/strings.xml index 01ebba5e75..d0ed95491e 100644 --- a/OsmAnd-telegram/res/values-zh-rTW/strings.xml +++ b/OsmAnd-telegram/res/values-zh-rTW/strings.xml @@ -27,7 +27,6 @@ 重新傳送位置 最後可用的位置 分享狀態 - 分享:已啟用 狀態 沒有 GPS 連接 沒有網際網路連線 diff --git a/OsmAnd-telegram/res/values/strings.xml b/OsmAnd-telegram/res/values/strings.xml index f3411f6a03..ed3532b797 100644 --- a/OsmAnd-telegram/res/values/strings.xml +++ b/OsmAnd-telegram/res/values/strings.xml @@ -107,7 +107,8 @@ Re-send location Last available location Sharing status - Sharing: Enabled + Sharing: %1$s + Enabled Status No GPS connection No internet connection diff --git a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt index d3fd22d46f..44b2f74314 100644 --- a/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt +++ b/OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt @@ -150,12 +150,13 @@ class MyLocationTabFragment : Fragment(), TelegramListener { } mainView.findViewById(R.id.status_title).apply { - val sharingStatus = getString(R.string.sharing_enabled) + val enabled = getString(R.string.shared_string_enabled) + val sharingStatus = getString(R.string.location_sharing_status, enabled) val spannable = SpannableString(sharingStatus) - spannable.setSpan( - ForegroundColorSpan(app.uiUtils.getActiveColor()), - sharingStatus.indexOf(" "), sharingStatus.length, 0 - ) + val start = sharingStatus.indexOf(enabled) + if (start != -1) { + spannable.setSpan(ForegroundColorSpan(app.uiUtils.getActiveColor()), start, start + enabled.length, 0) + } text = spannable }