From da7a6a16f8f95d4328215e6f708b051a66899d88 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 24 Jun 2015 10:34:19 +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 e483d0539..d7e905507 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -28,6 +28,7 @@ Name[sr@ijekavian]=Делфин Name[sr@ijekavianlatin]=Dolphin Name[sr@latin]=Dolphin Name[sv]=Dolphin +Name[tr]=Dolphin Name[uk]=Dolphin Name[x-test]=xxDolphinxx Name[zh_CN]=Dolphin @@ -66,6 +67,7 @@ GenericName[sr@ijekavian]=Менаџер фајлова GenericName[sr@ijekavianlatin]=Menadžer fajlova GenericName[sr@latin]=Menadžer fajlova GenericName[sv]=Filhanterare +GenericName[tr]=Dosya Yöneticisi GenericName[uk]=Менеджер файлів GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 -- cgit v1.3.1