Skip to content

chore: Merge branch dev to main #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WSTxda merged 2 commits into from
Jan 17, 2026
Merged

chore: Merge branch dev to main #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3decd
chore: Update translations from Crowdin
crowdin-bot Jan 17, 2026
3506426
chore: Bump GMS version to 25.50.34
WSTxda Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ allprojects {
apply plugin: 'idea'

group = 'org.microg.gms'
ext.appVersionName = '6.0.0'
ext.appVersionCode = 254961000
ext.appVersionName = '6.1.0'
ext.appVersionCode = 255034000
ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
version = ext.appVersionName
ext.isReleaseVersion = false
Expand Down
2 changes: 1 addition & 1 deletion play-services-base/core/src/main/res/values-ko-rKR/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- %1$s is a notification text such as "Exposure Notification" -->
<string name="foreground_service_notification_text" formatted="true">백그라운드에서 \'%1$s\'가 실행 중입니다</string>
<!-- %1$s is a notification text such as "mnicroG Services" -->
<string name="foreground_service_notification_big_text">배터리 최적화에서 \'%1$s\'를 제외하거나 알림 설정을 변경하여 이 알림을 숨기십시오</string>
<string name="foreground_service_notification_big_text">배터리 최적화에서 \'%1$s\'를 제외하거나 알림 설정을 변경하여 이 알림을 숨기세요</string>
<!--foreground service: notification actions-->
<string name="foreground_action_battery_optimization">배터리 최적화</string>
<string name="foreground_action_notification_settings">설정</string>
Expand Down
2 changes: 1 addition & 1 deletion play-services-base/core/src/main/res/values-nl-rNL/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<string name="menu_settings">Instellingen</string>
<!--Google Cloud Messaging-->
<string name="list_no_item_none">Geen</string>
<string name="list_item_see_all">Bekijk alles</string>
<string name="list_item_see_all">Alles bekijken</string>
<!--gcm: network status-->
<string name="service_status_disabled">Uitgeschakeld</string>
<string name="service_status_enabled">Ingeschakeld</string>
Expand Down
2 changes: 1 addition & 1 deletion play-services-core/microg-ui-tools/src/main/res/values-fr-rFR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<string name="update_checker_button">Vérifier les mises à jour</string>
<string name="update_checker_download_button">Télécharger</string>
<!--updater: messages-->
<string name="update_checker_no_update">Pas mise à jour disponible</string>
<string name="update_checker_no_update">Pas de mise à jour disponible</string>
<string name="update_checker_update_available">Nouvelle mise à jour disponible : %s</string>
<string name="update_checker_no_internet">Pas de connexion Internet</string>
<string name="update_checker_generic_error">Une erreur s\'est produite… Veuillez réessayer plus tard</string>
Expand Down
4 changes: 2 additions & 2 deletions play-services-core/microg-ui-tools/src/main/res/values-ko-rKR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<string name="update_checker_no_update">새로운 업데이트가 없습니다</string>
<string name="update_checker_update_available">업데이트 사용 가능: %s</string>
<string name="update_checker_no_internet">인터넷 연결이 되지 않음</string>
<string name="update_checker_generic_error">문제가 발생하였습니다... 나중에 다시 시도하십시오</string>
<string name="update_checker_generic_error">문제가 발생하였습니다... 나중에 다시 시도하세요</string>
<!--Settings About-->
<string name="about_morphe_description">Morphe는 패치를 통해 Android 앱을 수정하도록 설계된 오픈 소스 프로젝트입니다</string>
<string name="about_version_str">버전 %1$s</string>
Expand All @@ -31,7 +31,7 @@
<!--self-check: permission-->
<string name="self_check_cat_permissions">권한</string>
<string name="self_check_name_permission">\'%1$s\'에 대한 권한:</string>
<string name="self_check_resolution_permission">권한을 허용하려면 여기를 탭하십시오. 권한을 허용하지 않으면 애플리케이션이 제대로 작동하지 않을 수 있습니다</string>
<string name="self_check_resolution_permission">권한을 허용하려면 여기를 탭하세요. 권한을 허용하지 않으면 애플리케이션이 제대로 작동하지 않을 수 있습니다</string>
<!--Settings Preferences-->
<!--preferences: self-check-->
<string name="self_check_title">셀프 체크</string>
Expand Down
2 changes: 1 addition & 1 deletion play-services-core/microg-ui-tools/src/main/res/values-nl-rNL/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<string name="self_check_title">zelfcontrole</string>
<string name="self_check_desc">Controleer of het apparaat correct is geconfigureerd voor het gebruik van microG</string>
<!--UI preview-->
<string name="about_root_title">microG UI Demo</string>
<string name="about_root_title">UI-demo microG</string>
<string name="about_root_version">Versie v0.1.0</string>
<string name="about_root_libraries">Included libraries</string>
</resources>
2 changes: 1 addition & 1 deletion play-services-core/microg-ui-tools/src/main/res/values-uk-rUA/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<string name="update_checker_no_internet">Немає підключення до Інтернету</string>
<string name="update_checker_generic_error">Щось пішло не так… Будь ласка, спробуйте пізніше</string>
<!--Settings About-->
<string name="about_morphe_description">Morphe - відкритий проект, призначений для модифікації застосунків Android через патчі</string>
<string name="about_morphe_description">Morphe — відкритий проєкт, призначений для модифікації застосунків Android через патчі</string>
<string name="about_version_str">Версія %1$s</string>
<string name="about_default_license">Усі права захищено</string>
<!--Self Check-->
Expand Down
4 changes: 2 additions & 2 deletions play-services-core/microg-ui-tools/src/main/res/values-vi-rVN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
<!--Settings Preferences-->
<!--preferences: self-check-->
<string name="self_check_title">Tự kiểm tra</string>
<string name="self_check_desc">Xác minh xem thiết bị đã được cấu hình đúng để sử dụng MicroG chưa</string>
<string name="self_check_desc">Xác minh xem thiết bị đã được cấu hình đúng để sử dụng microG chưa</string>
<!--UI preview-->
<string name="about_root_title">Demo giao diện MicroG</string>
<string name="about_root_title">Demo giao diện microG</string>
<string name="about_root_version">Phiên bản v0.1.0</string>
<string name="about_root_libraries">Thư viện đi kèm</string>
</resources>
2 changes: 1 addition & 1 deletion play-services-core/src/main/res/values-fr-rFR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<!--auth: messages-->
<string name="auth_before_connect">"Connecter un compte Google avec microG.

Connectons-nous à un compte Google, utilisez le bouton <b>Connexion</b> ou, si vous avez un appareil Huawei, utilisez le bouton <b>Huawei</b>
Connectons-nous à un compte Google, utilisez le bouton <b>Se connecter</b> ou, si vous avez un appareil Huawei, utilisez le bouton <b>Huawei</b>
En appuyant sur l’un de ces boutons, vous serez redirigé vers la page de connexion à votre compte."</string>
<string name="auth_connecting">"Votre appareil établit une connexion avec les serveurs de Google pour vous connecter.

Expand Down
6 changes: 3 additions & 3 deletions play-services-core/src/main/res/values-in-rID/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ Data Anda tidak akan hilang"</string>
<string name="gcm_remove_registers_dialog_title">Hapus semua pendaftaran?</string>
<!-- %1$s is an app name, such as "YouTube"? -->
<string name="gcm_unregister_confirm_title">Batalkan pendaftaran %1$s?</string>
<string name="gcm_remove_registers_dialog_message">"Ini akan menghapus semua aplikasi terdaftar untuk tidak menerima notifikasi dorong sekaligus
<string name="gcm_remove_registers_dialog_message">"Ini akan menghapus semua aplikasi terdaftar untuk menerima notifikasi dorong sekaligus

Anda akan membutuhkan securityToken dan AndroidID baru untuk mendaftarkan aplikasi. Periksa status pendaftaran perangkat
Anda akan membutuhkan Token keamanan dan AndroidID baru untuk mendaftarkan aplikasi. Periksa status pendaftaran perangkat

Beberapa aplikasi mungkin tidak dapat mendaftar lagi setelah aksi ini. Anda mungkin perlu membersihkan data untuk aplikasi ini sebelum mereka dapat meminta pendaftaran lagi"</string>
Beberapa aplikasi mungkin tidak dapat mendaftar lagi setelah melakukan ini. Anda mungkin perlu menghapus data aplikasi-aplikasi tersebut sebelum mereka dapat meminta pendaftaran lagi"</string>
<string name="gcm_unregister_confirm_message">"Beberapa aplikasi tidak secara otomatis mendaftar ulang dan/atau tidak menyediakan pilihan untuk melakukannya secara manual. Aplikasi-aplikasi ini mungkin tidak berfungsi dengan benar setelah proses pembatalan pendaftaran.
Lanjutkan?"</string>
<string name="gcm_remove_registers_toast_message">Semua aplikasi dihapus dari notifikasi dorong</string>
Expand Down
Loading