From 19070746c7851347986e3e106429874d3a33213e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Sep 2021 01:28:13 +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/users/kcm_users.desktop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kcms/users/kcm_users.desktop b/kcms/users/kcm_users.desktop index ee738e1a9..190ebfb5f 100644 --- a/kcms/users/kcm_users.desktop +++ b/kcms/users/kcm_users.desktop @@ -81,7 +81,7 @@ Comment[tr]=Kullanıcı hesaplarını yönet Comment[uk]=Керування обліковими записами Comment[vi]=Quản lí các danh khoản người dùng Comment[x-test]=xxManage user accountsxx -Comment[zh_CN]=管理用户帐户. +Comment[zh_CN]=管理用户账户 Comment[zh_TW]=管理使用者帳號 X-KDE-Keywords=users,accounts,profile picture,profile photo,avatar,name,password,passwords,email,e-mail,administrator,root user,standard user,profile,delete user,delete account,pfp X-KDE-Keywords[az]=users,accounts,profile picture,profile photo,avatar,name,password,passwords,email,e-mail,administrator,root user,standard user,profile, delete user,delete account,pfp,istifadəçilər,profil şəkli,profil fotoşəkili,ad,şifrə,şifrələr,epoçt,e-poçt,inzibatçı,kök istifadəsi,ilkin istifadəçi,profil,istifadəçini silmək,hesabı silmək @@ -98,3 +98,4 @@ X-KDE-Keywords[sv]=användare,konton,profilbild,profilfoto,avatar,namn,lösenord X-KDE-Keywords[uk]=users,accounts,profile picture,profile photo,avatar,name,password,passwords,email,e-mail,administrator,root user,standard user,profile,delete user,delete account,pfp,користувачі,облікові записи,записи,зображення профілю,фото профілю,аватар,ім'я,назва,пароль,паролі,електронна пошта,адміністратор,користувач рут,стандартний користувач,профіль,вилучити користувача,вилучити обліковий запис,пфп,пеефпе X-KDE-Keywords[vi]=users,accounts,profile picture,profile photo,avatar,name,password,passwords,email,e-mail,administrator,root user,standard user,profile,delete user,delete account,pfp,người dùng,danh khoản,ảnh hồ sơ,hiện thân ảo,tên,mật khẩu,thư,thư điện tử,quản trị viên,người dùng gốc,người dùng thường,hồ sơ,xoá người dùng,xoá danh khoản X-KDE-Keywords[x-test]=xxusersxx,xxaccountsxx,xxprofile picturexx,xxprofile photoxx,xxavatarxx,xxnamexx,xxpasswordxx,xxpasswordsxx,xxemailxx,xxe-mailxx,xxadministratorxx,xxroot userxx,xxstandard userxx,xxprofilexx,xxdelete userxx,xxdelete accountxx,xxpfpxx +X-KDE-Keywords[zh_CN]=users,accounts,profile picture,profile photo,avatar,name,password,passwords,email,e-mail,administrator,root user,standard user,profile,delete user,delete account,pfp,用户,账户,个人资料头像,头像,名字,密码,电子邮件,电子邮箱,电子邮件地址,管理员,root 用户,标准用户,个人资料,删除用户,删除账户