From ea7d91c5ca04e18f67585ca3f8cd7bacf0ab878f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 18 Jun 2021 01:22:39 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcms/users/kcm_users.desktop b/kcms/users/kcm_users.desktop index 059a6a81f..e0cc18420 100644 --- a/kcms/users/kcm_users.desktop +++ b/kcms/users/kcm_users.desktop @@ -81,7 +81,7 @@ Comment[zh_CN]=管理用户帐户. X-KDE-Keywords=user,account X-KDE-Keywords[az]=istifadəçi,hesab,user,account X-KDE-Keywords[ca]=usuari,compte -X-KDE-Keywords[cs]=Uživatelský účet +X-KDE-Keywords[cs]=uživatel,účet X-KDE-Keywords[da]=bruger,konto X-KDE-Keywords[de]=benutzer,konto,account X-KDE-Keywords[en_GB]=user,account