diff options
| author | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-04 11:02:00 +0000 |
| commit | 4e96b1a42f7718d7c2401e5abed3e30267f7e0ea (patch) | |
| tree | bd7347e3f0f25b217f16765c83f708f4bab549ea /src/org.kde.dolphin.desktop | |
| parent | de84f223d4408dc1eaf6f15ebeed2e8acf49ad4c (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 36a9f6a9f..81bf729c6 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -14,6 +14,7 @@ Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin Name[sk]=Dolphin +Name[sl]=Dolphin Name[sr]=Делфин Name[sr@ijekavian]=Делфин Name[sr@ijekavianlatin]=Dolphin @@ -42,6 +43,7 @@ GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos GenericName[sk]=Správca súborov +GenericName[sl]=Upravljalnik datotek GenericName[sr]=Менаџер фајлова GenericName[sr@ijekavian]=Менаџер фајлова GenericName[sr@ijekavianlatin]=Menadžer fajlova |