From 16ff80d6b5f1fe1ec492d48bddea83ee749ebab1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Jan 2026 01:42:31 +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" --- quicksettings/flashlight/kauth/flashlighthelper.actions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicksettings/flashlight/kauth/flashlighthelper.actions b/quicksettings/flashlight/kauth/flashlighthelper.actions index 7f428da9..cb42fe2d 100644 --- a/quicksettings/flashlight/kauth/flashlighthelper.actions +++ b/quicksettings/flashlight/kauth/flashlighthelper.actions @@ -56,7 +56,7 @@ Name[zh_TW]=設定手電筒亮度 Description=Allow set brightness on led device Description[ar]=تسمح بضبط السطوع على جهاز led Description[ca]=Permet establir la lluminositat del dispositiu LED -Description[ca@valencia]=Permet establir la lluminositat del dispositiu LED +Description[ca@valencia]=Permet establir la brillantor del dispositiu LED Description[es]=Permitir ajustar el brillo del led del dispositivo Description[eu]=LED-gailuaren distira ezartzeko aukera eskaintzen du Description[fi]=Salli LED-laitteen kirkkauden asettaminen