diff options
| author | l10n daemon script <[email protected]> | 2021-04-23 01:19:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-04-23 01:19:55 +0000 |
| commit | 020ba2c3fc94336545f6b8d7c13c9a615000482a (patch) | |
| tree | 162a2222c6664375ed2f18b5ed3471e49e03f70d /src/org.kde.dolphin.desktop | |
| parent | cede4fed799a17c2ecd6186ef8f731c61b4a4139 (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 7020ef70a..63509b476 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -43,6 +43,7 @@ Name[sr@ijekavian]=Делфин Name[sr@ijekavianlatin]=Dolphin Name[sr@latin]=Dolphin Name[sv]=Dolphin +Name[ta]=டால்பின் Name[tr]=Dolphin Name[uk]=Dolphin Name[vi]=Dolphin @@ -98,6 +99,7 @@ GenericName[sr@ijekavian]=Менаџер фајлова GenericName[sr@ijekavianlatin]=Menadžer fajlova GenericName[sr@latin]=Menadžer fajlova GenericName[sv]=Filhanterare +GenericName[ta]=கோப்பு உலாவி GenericName[tr]=Dosya Yöneticisi GenericName[uk]=Менеджер файлів GenericName[vi]=Trình quản lí tệp |