diff options
| author | l10n daemon script <[email protected]> | 2017-01-13 05:50:46 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-01-13 05:50:46 +0100 |
| commit | c1eeb0e115b6074e296892c95192cf464c0c83c9 (patch) | |
| tree | 6280f8e1f958649fd59c42fc5ac53915c81136ed /src/org.kde.dolphin.desktop | |
| parent | 82c944f63f2994848f870053987388aa537e6fd8 (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 f50ef2b6c..63b72d966 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Dolphin Name[ar]=دولفين +Name[ast]=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin @@ -48,6 +49,7 @@ X-DocPath=dolphin/index.html Categories=Qt;KDE;System;FileTools;FileManager; GenericName=File Manager GenericName[ar]=مدير ملفّات +GenericName[ast]=Xestor de ficheros GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů |