From af1e13f9fa86c6a7f9bf397269559eda38e7aec6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 Nov 2020 06:20:03 +0100 Subject: 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" --- src/org.kde.dolphin.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/org.kde.dolphin.desktop') diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 6427e9ffd..7020ef70a 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -16,6 +16,7 @@ Name[eu]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin +Name[he]=Dolphin Name[hu]=Dolphin Name[ia]=Dolphin Name[id]=Dolphin -- cgit v1.3