From 31e2f61ba1a4aeec2b32244107db75bfd32c2c9a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Sep 2021 01:14: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 | 1 + 1 file changed, 1 insertion(+) diff --git a/kcms/users/kcm_users.desktop b/kcms/users/kcm_users.desktop index e67f00934..48a5d5baf 100644 --- a/kcms/users/kcm_users.desktop +++ b/kcms/users/kcm_users.desktop @@ -88,6 +88,7 @@ X-KDE-Keywords[az]=users,accounts,profile picture,profile photo,avatar,name,pass 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[fi]=käyttäjät,tilit,profiilikuva,valokuva,avatar,nimi,salasana,salasanat,sähköposti,ylläpitäjä,pääkäyttäjä,root,tavallinen käyttäjä,profiili,poista käyttäjä,poista tili,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[ia]=usatores,contos,image de profilo,photo de profilo,avatar,nomine,contrasigno,contrasignos,eposta,e-posta,administrator,root usator,usator standard,profilo,dele usator,dele conto,pfp X-KDE-Keywords[it]=utenti,account,immagine del profilo,foto del profilo,avatar,nome,password,email,e-mail,amministratore,utente root,utente standard,profilo,elimina utente,elimina account,pfp