diff options
| author | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-24 10:34:19 +0000 |
| commit | da7a6a16f8f95d4328215e6f708b051a66899d88 (patch) | |
| tree | b3453c56f05896c91a037db6f95eda1cf72c6ab6 /src/org.kde.dolphin.desktop | |
| parent | b07a63797b36c504959d632ff839a7ced1249dc1 (diff) | |
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"
Diffstat (limited to 'src/org.kde.dolphin.desktop')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
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]=文件管理器 |