Skip to content

Commit 9b34a9e

Browse files
authored
Merge pull request #276 from naz013/release/9.5.2
Merge release/9.5.2 into master
2 parents 3aeec84 + bae1d87 commit 9b34a9e

File tree

20 files changed

+3
-21
lines changed

20 files changed

+3
-21
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId = "com.cray.software.justreminder"
2323
minSdk = libs.versions.minSdk.get().toInt()
2424
targetSdk = libs.versions.targetSdk.get().toInt()
25-
versionCode = 327
26-
versionName = "9.5.1"
25+
versionCode = 328
26+
versionName = "9.5.2"
2727
multiDexEnabled = true
2828
renderscriptTargetApi = 23
2929
renderscriptSupportModeEnabled = true

app/src/main/java/com/elementary/tasks/core/os/data/UiPermissionDialogData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ data class UiPermissionDialogData(
6666
val BACKGROUND_LOCATION = UiPermissionDialogData(
6767
Permissions.BACKGROUND_LOCATION,
6868
R.string.background_location,
69-
R.string.background_location_explanation
69+
R.string.bg_location_message
7070
)
7171
val FOREGROUND_SERVICE = UiPermissionDialogData(
7272
Permissions.FOREGROUND_SERVICE,

ui-common/src/main/res/values-bg/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">Услуга на преден план</string>
611611
<string name="foreground_service_explanation">За да може приложението да бъде напълно функционално, то изисква разрешение за Foreground Service</string>
612612
<string name="background_location">Фоново местоположение</string>
613-
<string name="background_location_explanation">За да ви проследява, когато имате активни напомняния за местоположение, приложението изисква разрешение за фоново местоположение</string>
614613
<string name="failed_to_start_voice_recognition">Неуспешно стартиране на гласовото разпознаване</string>
615614
<string name="failed_to_send_note">Неуспешно изпращане на бележка</string>
616615
<string name="shuffle_digits">Разбъркване на цифри</string>

ui-common/src/main/res/values-cs/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">Služba popředí</string>
611611
<string name="foreground_service_explanation">Aby byla aplikace plně funkční, vyžaduje oprávnění služby popředí</string>
612612
<string name="background_location">Umístění pozadí</string>
613-
<string name="background_location_explanation">Aby vás mohla sledovat, když máte aktivní připomenutí polohy, aplikace vyžaduje oprávnění Poloha na pozadí</string>
614613
<string name="failed_to_start_voice_recognition">Rozpoznávání hlasu se nepodařilo spustit</string>
615614
<string name="failed_to_send_note">Odeslání poznámky se nezdařilo</string>
616615
<string name="shuffle_digits">Zamíchat číslice</string>

ui-common/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@
530530
<string name="foreground_service">Vordergrunddienst</string>
531531
<string name="foreground_service_explanation">Damit die Anwendung voll funktionsfähig ist, ist eine Foreground Service-Berechtigung erforderlich</string>
532532
<string name="background_location">Hintergrund-Standort</string>
533-
<string name="background_location_explanation">Um Sie zu verfolgen, wenn Sie aktive Standorterinnerungen haben, benötigt die Anwendung die Berechtigung zum Hintergrundstandort</string>
534533
<string name="failed_to_start_voice_recognition">Spracherkennung konnte nicht gestartet werden</string>
535534
<string name="failed_to_send_note">Hinweis konnte nicht gesendet werden</string>
536535
<string name="shuffle_digits">Ziffern mischen</string>

ui-common/src/main/res/values-en/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,6 @@
611611
<string name="foreground_service">Foreground Service</string>
612612
<string name="foreground_service_explanation">To allow application be fully functional, it requires Foreground Service permission</string>
613613
<string name="background_location">Background Location</string>
614-
<string name="background_location_explanation">To track You when You have active location reminders, application requires Background Location permission</string>
615614
<string name="failed_to_start_voice_recognition">Failed to start voice recognition</string>
616615
<string name="failed_to_send_note">Failed to send Note</string>
617616
<string name="shuffle_digits">Shuffle digits</string>

ui-common/src/main/res/values-es/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@
530530
<string name="foreground_service">Servicio de primer plano</string>
531531
<string name="foreground_service_explanation">Para permitir que la aplicación sea completamente funcional, requiere el permiso de servicio de primer plano</string>
532532
<string name="background_location">Ubicación de fondo</string>
533-
<string name="background_location_explanation">Para rastrearlo cuando tiene recordatorios de ubicación activos, la aplicación requiere el permiso de ubicación en segundo plano</string>
534533
<string name="failed_to_start_voice_recognition">No se pudo iniciar el reconocimiento de voz</string>
535534
<string name="failed_to_send_note">No se pudo enviar la nota</string>
536535
<string name="shuffle_digits">Mezclar dígitos</string>

ui-common/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@
530530
<string name="foreground_service">Service de premier plan</string>
531531
<string name="foreground_service_explanation">Pour permettre à l\'application d\'être pleinement fonctionnelle, elle nécessite l\'autorisation du service de premier plan</string>
532532
<string name="background_location">Emplacement d\'arrière-plan</string>
533-
<string name="background_location_explanation">Pour vous suivre lorsque vous avez des rappels de localisation actifs, l\'application nécessite une autorisation de localisation en arrière-plan</string>
534533
<string name="failed_to_start_voice_recognition">Impossible de démarrer la reconnaissance vocale</string>
535534
<string name="failed_to_send_note">Échec de l\'envoi de la note</string>
536535
<string name="shuffle_digits">Mélanger les chiffres</string>

ui-common/src/main/res/values-hi/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">अग्रभूमि सेवा</string>
611611
<string name="foreground_service_explanation">एप्लिकेशन को पूरी तरह कार्यात्मक होने देने के लिए, उसे फ़ोरग्राउंड सेवा की अनुमति की आवश्यकता होती है</string>
612612
<string name="background_location">पृष्ठभूमि स्थान</string>
613-
<string name="background_location_explanation">आपके पास सक्रिय स्थान अनुस्मारक होने पर आपको ट्रैक करने के लिए, एप्लिकेशन को पृष्ठभूमि स्थान अनुमति की आवश्यकता होती है</string>
614613
<string name="failed_to_start_voice_recognition">ध्वनि पहचान प्रारंभ करने में विफल</string>
615614
<string name="failed_to_send_note">नोट भेजने में विफल</string>
616615
<string name="shuffle_digits">अंकों में फेरबदल करें</string>

ui-common/src/main/res/values-it/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">Servizio in primo piano</string>
611611
<string name="foreground_service_explanation">Per consentire all\'applicazione di essere completamente funzionante, è necessaria l\'autorizzazione del servizio in primo piano</string>
612612
<string name="background_location">Posizione di sfondo</string>
613-
<string name="background_location_explanation">Per rintracciarti quando hai promemoria sulla posizione attivi, l\'applicazione richiede l\'autorizzazione alla posizione in background</string>
614613
<string name="failed_to_start_voice_recognition">Impossibile avviare il riconoscimento vocale</string>
615614
<string name="failed_to_send_note">Impossibile inviare la nota</string>
616615
<string name="shuffle_digits">Mescola le cifre</string>

ui-common/src/main/res/values-ja/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">フォアグラウンド サービス</string>
611611
<string name="foreground_service_explanation">アプリケーションを完全に機能させるには、フォアグラウンド サービスのアクセス許可が必要です</string>
612612
<string name="background_location">背景の場所</string>
613-
<string name="background_location_explanation">アクティブな場所のリマインダーがあるときにあなたを追跡するには、アプリケーションにはバックグラウンドの場所へのアクセス許可が必要です</string>
614613
<string name="failed_to_start_voice_recognition">音声認識の開始に失敗しました</string>
615614
<string name="failed_to_send_note">メモの送信に失敗しました</string>
616615
<string name="shuffle_digits">桁をシャッフルする</string>

ui-common/src/main/res/values-ko/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">포그라운드 서비스</string>
611611
<string name="foreground_service_explanation">애플리케이션이 완전히 작동하려면 포그라운드 서비스 권한이 필요합니다.</string>
612612
<string name="background_location">배경 위치</string>
613-
<string name="background_location_explanation">활성 위치 알림이 있을 때 사용자를 추적하려면 애플리케이션에 백그라운드 위치 권한이 필요합니다.</string>
614613
<string name="failed_to_start_voice_recognition">음성 인식을 시작하지 못했습니다.</string>
615614
<string name="failed_to_send_note">메모를 보내지 못했습니다.</string>
616615
<string name="shuffle_digits">숫자 섞기</string>

ui-common/src/main/res/values-pl/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@
530530
<string name="foreground_service">Usługa pierwszoplanowa</string>
531531
<string name="foreground_service_explanation">Aby aplikacja była w pełni funkcjonalna, wymaga uprawnień Usługi pierwszoplanowej</string>
532532
<string name="background_location">Lokalizacja w tle</string>
533-
<string name="background_location_explanation">Aby śledzić Cię, gdy masz aktywne przypomnienia o lokalizacji, aplikacja wymaga uprawnień Lokalizacja w tle</string>
534533
<string name="failed_to_start_voice_recognition">Nie udało się uruchomić rozpoznawania głosu</string>
535534
<string name="failed_to_send_note">Nie udało się wysłać notatki</string>
536535
<string name="shuffle_digits">Przetasuj cyfry</string>

ui-common/src/main/res/values-pt/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">Serviço de primeiro plano</string>
611611
<string name="foreground_service_explanation">Para permitir que o aplicativo seja totalmente funcional, ele requer permissão de serviço de primeiro plano</string>
612612
<string name="background_location">Localização de fundo</string>
613-
<string name="background_location_explanation">Para rastreá-lo quando você tiver lembretes de localização ativos, o aplicativo requer permissão de localização em segundo plano</string>
614613
<string name="failed_to_start_voice_recognition">Falha ao iniciar o reconhecimento de voz</string>
615614
<string name="failed_to_send_note">Falha ao enviar Nota</string>
616615
<string name="shuffle_digits">Dígitos aleatórios</string>

ui-common/src/main/res/values-ro/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">Serviciul de prim plan</string>
611611
<string name="foreground_service_explanation">Pentru a permite ca aplicația să fie pe deplin funcțională, necesită permisiunea serviciului de prim plan</string>
612612
<string name="background_location">Locație de fundal</string>
613-
<string name="background_location_explanation">Pentru a vă urmări când aveți mementouri de locație active, aplicația necesită permisiunea Locație în fundal</string>
614613
<string name="failed_to_start_voice_recognition">Nu s-a pornit recunoașterea vocală</string>
615614
<string name="failed_to_send_note">Nu s-a putut trimite nota</string>
616615
<string name="shuffle_digits">Amestecă cifrele</string>

ui-common/src/main/res/values-ru/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">Служба переднего плана</string>
611611
<string name="foreground_service_explanation">Чтобы приложение могло быть полностью функциональным, ему требуется разрешение службы переднего плана.</string>
612612
<string name="background_location">Фоновое местоположение</string>
613-
<string name="background_location_explanation">Чтобы отслеживать вас, когда у вас есть напоминания об активном местоположении, приложению требуется разрешение на фоновое местоположение.</string>
614613
<string name="failed_to_start_voice_recognition">Не удалось запустить распознавание голоса</string>
615614
<string name="failed_to_send_note">Не удалось отправить заметку</string>
616615
<string name="shuffle_digits">Перемешать цифры</string>

ui-common/src/main/res/values-tr/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">Ön Plan Hizmeti</string>
611611
<string name="foreground_service_explanation">Uygulamanın tamamen işlevsel olmasına izin vermek için Ön Plan Hizmeti izni gerekir</string>
612612
<string name="background_location">Arka Plan Konumu</string>
613-
<string name="background_location_explanation">Aktif konum hatırlatıcılarınız olduğunda sizi izlemek için, uygulama Arka Plan Konumu izni gerektirir</string>
614613
<string name="failed_to_start_voice_recognition">Ses tanıma başlatılamadı</string>
615614
<string name="failed_to_send_note">Not gönderilemedi</string>
616615
<string name="shuffle_digits">Rakamları karıştır</string>

ui-common/src/main/res/values-uk/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@
530530
<string name="foreground_service">Служба переднього плану</string>
531531
<string name="foreground_service_explanation">Щоб програма була повністю функціональною, їй потрібен дозвіл Foreground Service</string>
532532
<string name="background_location">Розташування у фоновому режимі</string>
533-
<string name="background_location_explanation">Щоб стежити за вами, коли у вас є активні нагадування про місцезнаходження, програмі потрібен дозвіл на фонове місцезнаходження</string>
534533
<string name="failed_to_start_voice_recognition">Не вдалося запустити розпізнавання голосу</string>
535534
<string name="failed_to_send_note">Не вдалося надіслати нотатку</string>
536535
<string name="shuffle_digits">Перетасувати цифри</string>

ui-common/src/main/res/values-zh/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@
610610
<string name="foreground_service">前台服務</string>
611611
<string name="foreground_service_explanation">為了讓應用程序發揮全部功能,它需要前台服務權限</string>
612612
<string name="background_location">背景位置</string>
613-
<string name="background_location_explanation">要在您有活動位置提醒時跟踪您,應用程序需要後台位置權限</string>
614613
<string name="failed_to_start_voice_recognition">啟動語音識別失敗</string>
615614
<string name="failed_to_send_note">無法發送備註</string>
616615
<string name="shuffle_digits">隨機數字</string>

ui-common/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@
530530
<string name="foreground_service">Foreground Service</string>
531531
<string name="foreground_service_explanation">To allow the application to be fully functional, it requires Foreground Service permission</string>
532532
<string name="background_location">Background Location</string>
533-
<string name="background_location_explanation">To track You when You have active location reminders, the application requires Background Location permission</string>
534533
<string name="failed_to_start_voice_recognition">Failed to start voice recognition</string>
535534
<string name="failed_to_send_note">Failed to send Note</string>
536535
<string name="shuffle_digits">Shuffle digits</string>

0 commit comments

Comments
 (0)