Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/upstream' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler committed Jun 11, 2024
2 parents ea7be89 + a7c57df commit 450c0b4
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 46 deletions.
16 changes: 8 additions & 8 deletions .github/renovate.json → .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
{
"labels": [
"dependencies"
"dependencies",
],
"extends": [
"config:base"
"config:base",
],
"packageRules": [
{
"groupName": "Kotlin and KSP",
"matchPackagePrefixes": [
"com.google.devtools.ksp"
"com.google.devtools.ksp",
],
"matchPackagePatterns": [
"org.jetbrains.kotlin.*"
"org.jetbrains.kotlin.*",
]
},
{
"groupName": "AGP",
"matchPackagePatterns": [
"com.android.*"
"com.android.*",
]
},
{
"groupName": "dev.rikka.tools.refine",
"matchPackagePrefixes": [
"dev.rikka.tools.refine"
"dev.rikka.tools.refine",
]
},
{
"groupName": "androidx.lifecycle",
"matchPackagePatterns": [
"androidx.lifecycle:*"
"androidx.lifecycle:*",
]
},
{
"groupName": "Dagger",
"matchPackagePrefixes": [
"com.google.dagger"
"com.google.dagger",
]
}
]
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import com.android.build.gradle.api.AndroidBasePlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'com.android.application' version "8.4.1"
id 'com.android.library' version "8.4.1" apply false
id 'com.android.test' version '8.4.1' apply false
id 'com.android.application' version "8.4.2"
id 'com.android.library' version "8.4.2" apply false
id 'com.android.test' version '8.4.2' apply false
id 'androidx.baselineprofile' version '1.2.4'
id 'org.jetbrains.kotlin.android' version "2.0.0"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0"
Expand Down
18 changes: 9 additions & 9 deletions lawnchair/res/values-da-rDK/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -431,15 +431,15 @@
<string name="system_settings">Systemindstillinger</string>
<string name="action_unlock">Lås op</string>
<string name="action_lock">Lås</string>
<string name="allapps_twoline_label">Use Multiple Lines</string>
<string name="hidden_apps_show_always">Always</string>
<string name="hidden_apps_show_name_typed">If Full Name is Typed</string>
<string name="hidden_apps_show_never">Never</string>
<string name="show_hidden_apps_in_search_results">Show Hidden Apps in Search Results</string>
<string name="allapps_twoline_label">Brug flere linjer</string>
<string name="hidden_apps_show_always">Altid</string>
<string name="hidden_apps_show_name_typed">Hvis fulde navn skrives</string>
<string name="hidden_apps_show_never">Aldrig</string>
<string name="show_hidden_apps_in_search_results">Hvis gemte apps i søgeresultater</string>
<string name="search_algorithm_app_search">Appsøgning</string>
<string name="search_algorithm_global_search_on_device">Global Search (on-device)</string>
<string name="search_algorithm_global_search_via_asi">Global Search (via ASI)</string>
<string name="app_search_algorithm">Search Algorithm</string>
<string name="all_apps_search_result_calculator">Calculator</string>
<string name="search_algorithm_global_search_on_device">Global søgning (på enhed)</string>
<string name="search_algorithm_global_search_via_asi">Global søgning (via ASI)</string>
<string name="app_search_algorithm">Søgealgoritme</string>
<string name="all_apps_search_result_calculator">Lommeregner</string>
<string name="accessibility_service_description">To lock your phone when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, Lawnchair uses the performGlobalAction Accessibility service.</string>
</resources>
2 changes: 1 addition & 1 deletion lawnchair/res/values-en-rCA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<string name="dock_description">Search Bar, Icon Count</string>
<string name="app_drawer_label">App Drawer</string>
<string name="app_drawer_description">Hidden Apps, Column Count, Icons</string>
<string name="drawer_search_label">Drawer Search</string>
<string name="drawer_search_label"></string>
<string name="drawer_search_description">Web Suggestions, Global Search</string>
<string name="folders_label">Folders</string>
<string name="folders_description">Row and Column Count</string>
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -441,5 +441,5 @@
<string name="search_algorithm_global_search_via_asi">Recherche globale (via ASI)</string>
<string name="app_search_algorithm">Algorithme de recherche</string>
<string name="all_apps_search_result_calculator">Calculatrice</string>
<string name="accessibility_service_description">To lock your phone when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, Lawnchair uses the performGlobalAction Accessibility service.</string>
<string name="accessibility_service_description">Pour pouvoir verrouiller votre téléphone en un seul geste, Lawnchair a besoin des droits d\'accessibilité.\n\nLawnchair n\'observe aucune action utilisateur, mais ce privilège est accordé à tous les services d\'accessibilité. Lawnchair rejette tout événement envoyé par le système.\n\nAfin de verrouiller votre téléphone, Lawnchair utilise le service d\'accessibilité performGlobalAction.</string>
</resources>
10 changes: 5 additions & 5 deletions lawnchair/res/values-in-rID/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,12 @@
<string name="perform_wide_search_title">Penelusuran Perangkat</string>
<string name="perform_wide_search_description">Mencari kontak, file, dan pengaturan ponsel Anda</string>
<string name="max_apps_result_count_title">Jumlah Hasil Aplikasi Maksimum</string>
<string name="max_people_result_count_title">Maximum People Result Count</string>
<string name="max_file_result_count_title">Maximum Files Result Count</string>
<string name="max_settings_entry_result_count_title">Maximum Settings Result Count</string>
<string name="max_people_result_count_title">Jumlah Hasil Orang Maksimal</string>
<string name="max_file_result_count_title">Jumlah Hasil Orang Maksimal</string>
<string name="max_settings_entry_result_count_title">Jumlah Hasil Orang Maksimal</string>
<string name="max_recent_result_count_title">Jumlah Maksimum Riwayat Pencarian</string>
<string name="max_suggestion_result_count_title">Maximum Web Suggestions Result Count</string>
<string name="max_web_suggestion_delay">Maximum Web Suggestions Delay</string>
<string name="max_suggestion_result_count_title">Jumlah Hasil Saran Maksimal</string>
<string name="max_web_suggestion_delay"></string>
<string name="all_apps_search_market_message">Cari Lebih Banyak Aplikasi</string>
<string name="all_apps_search_startpage_message">Cari di <xliff:g id="startpage">Startpage</xliff:g></string>
<string name="error_no_market_or_browser_installed">Tidak ada toko aplikasi atau browser yang terinstal.</string>
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-sv-rSE/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -441,5 +441,5 @@
<string name="search_algorithm_global_search_via_asi">Global sökning (via ASI)</string>
<string name="app_search_algorithm">Sökalgoritm</string>
<string name="all_apps_search_result_calculator">Kalkylator</string>
<string name="accessibility_service_description">To lock your phone when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, Lawnchair uses the performGlobalAction Accessibility service.</string>
<string name="accessibility_service_description">För att kunna låsa din telefon när en gest görs kräver Lawnchair tillgänglighetsåtkomst.\n\nLawnchair övervakar inte några användaraktiviteter, men behörigheten att göra detta krävs för alla tillgänglighetstjänster. Lawnchair förkastar alla händelser som skickas av systemet.\n\nFör att kunna låsa din telefon använder Lawnchair tillgänglighetstjänsten performGlobalAction.</string>
</resources>
3 changes: 2 additions & 1 deletion lawnchair/res/values-uz-rUZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -441,5 +441,6 @@
<string name="search_algorithm_global_search_via_asi">Global qidiruv (ASI orqali)</string>
<string name="app_search_algorithm">Qidiruv algoritmi</string>
<string name="all_apps_search_result_calculator">Kalkulyator</string>
<string name="accessibility_service_description">To lock your phone when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, Lawnchair uses the performGlobalAction Accessibility service.</string>
<string name="accessibility_service_description">Imo-ishorani bajarayotganda telefoningizni qulflash uchun Lawnchair maxsus imkoniyatlarga kirishni talab qiladi.\n\nLawnchair hech qanday foydalanuvchi harakatini kuzatmaydi, lekin bu imtiyoz barcha maxsus imkoniyatlar xizmatlari uchun talab qilinadi.
Lawnchair tizim tomonidan yuborilgan har qanday hodisani bekor qiladi.\n\nTelefoningizni qulflash uchun Lawnchair Global Action Accessibility xizmatidan foydalanadi.</string>
</resources>
Loading

0 comments on commit 450c0b4

Please sign in to comment.