diff options
| author | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
| commit | 3b8623b0403a85751a3b48648a541f9534cd3d78 (patch) | |
| tree | a59737f1cd022c05a18772859c3280a737c2e8af /src/org.kde.dolphin.desktop | |
| parent | 7c343f21dd5c156e1a41823ca8984647d85c4ff8 (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 b23fec03c..7b8e19414 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Dolphin +Name[ar]=دولفين Name[ast]=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin @@ -45,6 +46,7 @@ Type=Application 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 |