From 0ee830e793eb2e79c47253862c260812a40227f3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Oct 2025 01:35:35 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- .../waydroidintegrationplugin/kauth/waydroidhelper.actions | 2 ++ quicksettings/flashlight/kauth/flashlighthelper.actions | 2 ++ 2 files changed, 4 insertions(+) diff --git a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions index 9a6224ed..3f5cc90b 100644 --- a/components/waydroidintegrationplugin/kauth/waydroidhelper.actions +++ b/components/waydroidintegrationplugin/kauth/waydroidhelper.actions @@ -142,6 +142,7 @@ Name[he]=איפוס Waydroid Name[is]=Endurstilla Waydroid Name[it]=Ripristina Waydroid Name[ka]=Waydroid-ის ჩამოყრა +Name[ko]=Waydroid 초기화 Name[lv]=Atiestatīt „Waydroid“ Name[nl]=Waydroid resetten Name[pl]=Wyzeruj Waydroida @@ -164,6 +165,7 @@ Description[he]=לאפשר את מחיקת התיקייה של waydroid Description[is]=Leyfa að waydroid-möppu sé eytt Description[it]=Permetti di eliminare la cartella waydroid Description[ka]=Waydroid-ის საქაღალდის წაშლის დაშვება +Description[ko]=Waydroid 폴더 삭제 허용 Description[lv]=Atļaut „Waydroid“ mapes dzēšanu Description[nl]=Toestaan Waydroid-map te verwijderen Description[pl]=Zezwól na usuwanie katalogu Waydroida diff --git a/quicksettings/flashlight/kauth/flashlighthelper.actions b/quicksettings/flashlight/kauth/flashlighthelper.actions index 204634d2..47a3fc56 100644 --- a/quicksettings/flashlight/kauth/flashlighthelper.actions +++ b/quicksettings/flashlight/kauth/flashlighthelper.actions @@ -40,6 +40,7 @@ Name[he]=הגדרת בהירות פנס Name[is]=Stilla birtustif á vasaljósi Name[it]=Imposta la luminosità della torcia Name[ka]=განათების სიკაშკაშის დაყენება +Name[ko]=플래시 밝기 설정 Name[lv]=Iestatīt kabatas lukturīša gaišumu Name[nl]=Helderheid van flitser instellen Name[pl]=Ustaw jasność latarki @@ -62,6 +63,7 @@ Description[he]=לאפשר להגדיר בהירות על התקן נורית Description[is]=Leyfa stillingu birtustigs á led-ljósi Description[it]=Consenti di impostare la luminosità sul dispositivo LED Description[ka]=LED მოწყობილობებზე სიკაშკაშის დაყენების დაშვება +Description[ko]=LED 장치 밝기 설정 허용 Description[lv]=Atļaut iestatīt LED ierīces gaišumu Description[nl]=Instellen toestaan van helderheid van led-apparaat Description[pl]=Zezwól na ustawianie jasności na urządzeniu LED