From 87f01931ede0fb6ff331ebc191fbe46eb5b18ceb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Nov 2021 01:29:53 +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/cursortheme/kcm_cursortheme.desktop | 1 + kcms/users/kcm_users.desktop | 2 ++ 2 files changed, 3 insertions(+) diff --git a/kcms/cursortheme/kcm_cursortheme.desktop b/kcms/cursortheme/kcm_cursortheme.desktop index 5a1e5957b..f3a62ddc6 100644 --- a/kcms/cursortheme/kcm_cursortheme.desktop +++ b/kcms/cursortheme/kcm_cursortheme.desktop @@ -92,6 +92,7 @@ Comment[x-test]=xxChoose mouse cursor themexx Comment[zh_CN]=选择鼠标光标主题 X-KDE-Keywords=Mouse,Cursor,Theme,Cursor Appearance,Cursor Color,Cursor Theme,Mouse Theme,Mouse Appearance,Mouse Skin,Pointer Colors,Pointer Appearance,cursor skin,cursor style,cursor size,mouse style,pointer, +X-KDE-Keywords[ar]=فأرة,مؤشر,سمة,مظهر المؤشر,لون المؤشر, سمة,سمة المؤشر,مظهر الفأرة,جلد الفأرة,لون المؤشر,مظهر المؤشر X-KDE-Keywords[az]=Mouse,Cursor,Theme,Cursor Appearance,Cursor Color,Cursor Theme,Mouse Theme,Mouse Appearance,Mouse Skin,Pointer Colors,Pointer Appearance,cursor skin,cursor style,cursor size,mouse style,pointer,Siçan,kursor,mövzü,kursor görünüşü,kursor rəngi,kursor mövzusu,siçan görünüşü,siçan örtüyü,göstəricinin rəngi,göstəricinin görünüşü,kursor örtüyü,kursor tərzi,kursor ölçüsü,siçan tərzi,göstərici X-KDE-Keywords[ca]=Ratolí,Cursor,Tema,Aparença de cursor,Color de cursor,Tema de cursor,Tema de ratolí,Aparença de ratolí,Pell de ratolí,Colors d'apuntador,Aparença d'apuntador,pell de cursor,estil de cursor,mida de cursor,estil de ratolí,apuntador X-KDE-Keywords[cs]=myš,kurzor,téma,vzhled kurzoru,barva kurzoru,motivy kurzoru,motiv myši,vzhled myši,barvy ukazatele,styl ukazatele,motiv kurzoru,styl kurzoru,velikost kurzoru,styl myši,ukazatel, diff --git a/kcms/users/kcm_users.desktop b/kcms/users/kcm_users.desktop index 0a4930f4f..d8ca4fe25 100644 --- a/kcms/users/kcm_users.desktop +++ b/kcms/users/kcm_users.desktop @@ -7,6 +7,7 @@ X-KDE-ParentApp=kcontrol X-KDE-Weight=40 X-KDE-System-Settings-Parent-Category=personalization Name=Users +Name[ar]=المستخدمين Name[az]=İstifadəçilər Name[ca]=Usuaris Name[cs]=Uživatelé @@ -26,6 +27,7 @@ Name[vi]=Người dùng Name[x-test]=xxUsersxx Name[zh_CN]=用户 Comment=Manage user accounts +Comment[ar]=أدِر حسابات المستخدمين Comment[az]=İstifadəçi hesablarını idarə edin Comment[ca]=Gestiona els comptes dels usuaris Comment[cs]=Správa uživatelských účtů