From ae1a29d5c70056a40c73ab83319b172683aa0501 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 24 May 2025 01:33: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" --- kcms/info/kcm_mobile_info.json | 1 + kcms/time/kcm_mobile_time.json | 1 + kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json | 1 + 3 files changed, 3 insertions(+) diff --git a/kcms/info/kcm_mobile_info.json b/kcms/info/kcm_mobile_info.json index 09e34c2f..37160b4d 100644 --- a/kcms/info/kcm_mobile_info.json +++ b/kcms/info/kcm_mobile_info.json @@ -88,6 +88,7 @@ "X-KDE-Keywords[ca@valencia]": "informació,distribució,sistema", "X-KDE-Keywords[ca]": "informació,distribució,sistema", "X-KDE-Keywords[cs]": "informace, distribuce, systém", + "X-KDE-Keywords[de]": "Information,Distribution,System", "X-KDE-Keywords[en_GB]": "info, distro, system", "X-KDE-Keywords[eo]": "informo, eldono, sistemo", "X-KDE-Keywords[es]": "información,distribución,sistema", diff --git a/kcms/time/kcm_mobile_time.json b/kcms/time/kcm_mobile_time.json index b8c0e9ae..bb7d84d0 100644 --- a/kcms/time/kcm_mobile_time.json +++ b/kcms/time/kcm_mobile_time.json @@ -88,6 +88,7 @@ "X-KDE-Keywords[ca@valencia]": "tema,aspecte,comportament", "X-KDE-Keywords[ca]": "tema,aspecte,comportament", "X-KDE-Keywords[cs]": "motiv,vzhled,chování", + "X-KDE-Keywords[de]": "Design,Erscheinungsbild", "X-KDE-Keywords[en_GB]": "theme, look, feel", "X-KDE-Keywords[eo]": "etoso, aspekto, sento", "X-KDE-Keywords[es]": "tema,aspecto", diff --git a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json index 488138a1..b13bd593 100644 --- a/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json +++ b/kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json @@ -129,6 +129,7 @@ "X-KDE-Keywords[ar]": "على الشاشة,لوحة المفاتيح الافتراضية,لوحة المفاتيح", "X-KDE-Keywords[ca@valencia]": "en pantalla,osk,teclat virtual,teclat", "X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat", + "X-KDE-Keywords[de]": "Bildschirmtastatur,Virtuelle Tastatur,Tastatur", "X-KDE-Keywords[en_GB]": "onscreen,osk,virtualkeyboard,keyboard", "X-KDE-Keywords[eo]": "surekrana,osk,virtualklavaro,klavaro", "X-KDE-Keywords[es]": "en pantalla,osk,teclado virtual,teclado",