From 1d89ef5079853107e14950d40a9fa63e04b2d76c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Mar 2024 01:18:23 +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" --- krfb/org.kde.krfb.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop index 5888b673..0d4ec182 100755 --- a/krfb/org.kde.krfb.desktop +++ b/krfb/org.kde.krfb.desktop @@ -8,6 +8,7 @@ X-DocPath=krfb/index.html Terminal=false Name=Krfb Name[ar]=كرفب +Name[ast]=Krfb Name[bg]=Krfb Name[bn]=কে-আর-এফ-বি Name[br]=Krfb