diff options
| author | l10n daemon script <[email protected]> | 2016-12-20 12:38:21 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-12-20 12:38:21 +0100 |
| commit | ae935d36b1565dd9a763f022caac5863071711fa (patch) | |
| tree | 95a53f5bce475de12b59761e3ed23ad99b5bfcb2 /src/org.kde.dolphin.desktop | |
| parent | d690b0719f3c48f65763df790e1f5c19dcc327a5 (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, 0 insertions, 2 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 63b72d966..f50ef2b6c 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Name=Dolphin Name[ar]=دولفين -Name[ast]=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin @@ -49,7 +48,6 @@ 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ů |