From fcbb5751f5adbd25905a2520eed4bc70b271f7dc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 11 Sep 2021 01:17:17 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/kcms/users/kcm_users.desktop b/kcms/users/kcm_users.desktop index 266288a28..ecac0638e 100644 --- a/kcms/users/kcm_users.desktop +++ b/kcms/users/kcm_users.desktop @@ -85,6 +85,7 @@ 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[ca]=usuaris,comptes,imatge de perfil,foto de perfil,avatar,nom,contrasenya,contrasenyes,correu,correu electrònic,administrador,usuari administrador,root,perfil estàndard,perfil,supressió d'usuari,suprimeix compte,pfp +X-KDE-Keywords[en_GB]=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[es]=usuarios,cuentas,imagen de perfil,foto de perfil,avatar,nombre,contraseña,contraseñas,email,e-mail,correo,correo electrónico,administrador,usuario root,usuario normal,perfil,borrar usuario,borrar cuenta,pfp X-KDE-Keywords[fr]=utilisateurs, comptes, image de profil, avatar, nom, mot de passe, mots de passe, courriel, email, administrateur, administrateur système, utilisateur standard, profil, supprimer un utilisateur, supprimer un compte, pfp X-KDE-Keywords[nl]=gebruikers,accounts,profielplaatje,profielfoto,avatar,naam,wachtwoord,wachtwoorden,e-mail,beheerder,root-gebruiker,standaard gebruiker,profiel,gebruiker verwijderen,account verwijderen,pfp