From 6499d2bc15d8b0a3285a17385fba980414f31981 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 5 May 2023 02:37:27 +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" --- src/kcms/desktop/kcm_kwin_virtualdesktops.json | 1 + src/kwin.notifyrc | 1 + 2 files changed, 2 insertions(+) diff --git a/src/kcms/desktop/kcm_kwin_virtualdesktops.json b/src/kcms/desktop/kcm_kwin_virtualdesktops.json index 96aef24ea0..5fc0570a00 100644 --- a/src/kcms/desktop/kcm_kwin_virtualdesktops.json +++ b/src/kcms/desktop/kcm_kwin_virtualdesktops.json @@ -47,6 +47,7 @@ "Icon": "preferences-desktop-virtual", "Name": "Virtual Desktops", "Name[ar]": "أسطح المكتب الافتراضية", + "Name[ast]": "Escritorios virtuales", "Name[az]": "Virtual iş masaları", "Name[be]": "Віртуальныя працоўныя сталы", "Name[bg]": "Виртуални работни плотове", diff --git a/src/kwin.notifyrc b/src/kwin.notifyrc index 141046f65c..35d5b63a59 100644 --- a/src/kwin.notifyrc +++ b/src/kwin.notifyrc @@ -360,6 +360,7 @@ Name[zh_CN]=Xwayland 崩溃 Name[zh_TW]=Xwayland 崩潰 Comment=Xwayland has crashed Comment[ar]=إنهار ويلاند_اكس +Comment[ast]=Xwayland cascó Comment[az]=Xwayland qəzaya uğradı Comment[be]=Адбыўся збой Xwayland Comment[bg]=Xwayland се срина