From 426607bb14b3f72d424b29e86cc02914f3db9a0a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Jan 2020 09:47:22 +0100 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" --- org.kde.konqueror.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/org.kde.konqueror.desktop b/org.kde.konqueror.desktop index c6337f5da..60396108a 100644 --- a/org.kde.konqueror.desktop +++ b/org.kde.konqueror.desktop @@ -106,6 +106,7 @@ GenericName[et]=Veebilehitseja, failihaldur ja -näitaja GenericName[eu]=Web arakatzailea, fitxategi kudeatzailea eta erakuslea GenericName[fr]=Navigateur Web, gestionnaire de fichiers et visionneuse GenericName[gl]=Navegador web, xestor de ficheiros e visor +GenericName[ia]=Navigator de Web, Gerente de File e Visor GenericName[id]=Penampil Web, Pengelila File dan Penampil GenericName[is]=Vafri, skráastjóri og skjalarýnir GenericName[it]=Browser Web, gestore di file e visore -- GitLab