From c9770e60839f60ffa29e56e9785a9a36b3d4a90c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Sep 2015 12:47:01 +0000 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 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/org.kde.dolphin.desktop') diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 0d25c1750..9c9408341 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -8,6 +8,7 @@ Name[es]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin +Name[hu]=Dolphin Name[ia]=Dolphin Name[id]=Dolphin Name[it]=Dolphin @@ -48,6 +49,7 @@ GenericName[es]=Gestor de archivos GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros +GenericName[hu]=Fájlkezelő GenericName[ia]=Gerente de file GenericName[id]=Manajer Berkas GenericName[it]=Gestore dei file -- cgit v1.3