From 74914f1ce30a1cb619588d62b2bd5116f159eb22 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 17 Oct 2026 01:57:20 +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" --- emojier/app/org.kde.plasma.emojier.desktop | 2 ++ kaccess/kaccess.desktop | 1 + kaccess/kaccess.notifyrc | 1 + kcms/touchpad/org.kde.touchpadshortcuts.desktop | 4 ++++ kded/screenreader/org.kde.screenreader.desktop | 2 ++ 5 files changed, 10 insertions(+) diff --git a/emojier/app/org.kde.plasma.emojier.desktop b/emojier/app/org.kde.plasma.emojier.desktop index 55e7853f05..79ca4a1fae 100755 --- a/emojier/app/org.kde.plasma.emojier.desktop +++ b/emojier/app/org.kde.plasma.emojier.desktop @@ -33,6 +33,7 @@ Name[ka]=Emoji -ების არჩევა Name[ko]=이모지 선택기 Name[lt]=Jaustukų parinkiklis Name[lv]=Emocijzīmju pārlūkotājs +Name[nan_TW@latin]=Emoji Kíng-suán-khì Name[nb]=Emoji-velger Name[nl]=Emoji selectieprogramma Name[nn]=Emoji-veljar @@ -82,6 +83,7 @@ GenericName[ka]=Emoji -ების არჩევა GenericName[ko]=이모지 선택기 GenericName[lt]=Jaustukų parinkiklis GenericName[lv]=Emocijzīmju pārlūkotājs +GenericName[nan_TW@latin]=Emoji Kíng-suán-khì GenericName[nb]=Emoji-velger GenericName[nl]=Emoji selectieprogramma GenericName[nn]=Emoji-veljar diff --git a/kaccess/kaccess.desktop b/kaccess/kaccess.desktop index fc1ccc8a88..a6fdf7d5cf 100644 --- a/kaccess/kaccess.desktop +++ b/kaccess/kaccess.desktop @@ -58,6 +58,7 @@ Name[mk]=Пристапливост Name[ml]=പ്രാപ്യത Name[mr]=सुलभता Name[ms]=Kebolehcapaian +Name[nan_TW@latin]=Bô-tsiòng-gāi Name[nb]=Tilgjengelighet Name[nds]=Toganghülp Name[ne]=पहुँचता diff --git a/kaccess/kaccess.notifyrc b/kaccess/kaccess.notifyrc index 92eb67b159..c66dd9a7e5 100644 --- a/kaccess/kaccess.notifyrc +++ b/kaccess/kaccess.notifyrc @@ -58,6 +58,7 @@ Comment[mk]=Пристапливост Comment[ml]=സാമീപ്യത Comment[mr]=सुलभता Comment[ms]=Kebolehcapaian +Comment[nan_TW@latin]=Bô-tsiòng-gāi Comment[nb]=Tilgjengelighet Comment[nds]=Toganghülp Comment[ne]=पहुँचता diff --git a/kcms/touchpad/org.kde.touchpadshortcuts.desktop b/kcms/touchpad/org.kde.touchpadshortcuts.desktop index efff9c035c..de54ba3257 100644 --- a/kcms/touchpad/org.kde.touchpadshortcuts.desktop +++ b/kcms/touchpad/org.kde.touchpadshortcuts.desktop @@ -123,8 +123,10 @@ Name[ca]=Desactiva el ratolí tàctil Name[ca@valencia]=Desactiva el ratolí tàctil Name[cs]=Zakázat touchpad Name[es]=Desactivar el panel táctil +Name[he]=השבתת משטח מגע Name[ka]=სენსორული პანელის გამორთვა Name[lt]=Išjungti jutiklinį kilimėlį +Name[lv]=Izslēgt skārienpaliktni Name[nl]=Touchpad uitschakelen Name[pt_BR]=Desativar o touchpad Name[ru]=Выключить сенсорную панель @@ -141,8 +143,10 @@ Name[ca]=Commuta el ratolí tàctil Name[ca@valencia]=Activa o desactiva el ratolí tàctil Name[cs]=Přepnout touchpad Name[es]=Conmutar el panel táctil +Name[he]=הפעלת/השבתת משטח מגע Name[ka]=სენსორული პანელის გადართვა Name[lt]=Perjungti jutiklinį kilimėlį +Name[lv]=Pārslēgt skārienpaliktni Name[nl]=Touchpad omschakelen Name[pt_BR]=Alternar o touchpad Name[ru]=Включить или выключить сенсорную панель diff --git a/kded/screenreader/org.kde.screenreader.desktop b/kded/screenreader/org.kde.screenreader.desktop index 7d47aedffc..e03f5cf124 100644 --- a/kded/screenreader/org.kde.screenreader.desktop +++ b/kded/screenreader/org.kde.screenreader.desktop @@ -61,6 +61,7 @@ Name[mk]=Пристапливост Name[ml]=പ്രാപ്യത Name[mr]=सुलभता Name[ms]=Kebolehcapaian +Name[nan_TW@latin]=Bô-tsiòng-gāi Name[nb]=Tilgjengelighet Name[nds]=Toganghülp Name[ne]=पहुँचता @@ -120,6 +121,7 @@ Name[it]=Attiva e disattiva il lettore dello schermo Name[ka]=ეკრანის წამკითხველის ჩართვა/გამორთვა Name[ko]=스크린 리더 켜고 끄기 Name[lt]=Įjungti arba išjungti ekrano skaityklę +Name[lv]=Ieslēgt/izslēgt ekrāna lasītāju Name[nl]=Schermlezer aan en uit omschakelen Name[nn]=Slå skjermlesar på/av Name[pl]=Włącz/wyłącz czytnik ekranowy