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"
wilder-5.24
l10n daemon script 5 years ago committed by Devin Lin
parent 507a3c97a6
commit fcbb5751f5
  1. 1
      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

Loading…
Cancel
Save