diff options
| author | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
| commit | bc8f3373fd98121fbe230842bbb104889961e6d7 (patch) | |
| tree | c7e72e274512eace488b9fab23293e009bb6d7cf /src/org.kde.dolphin.desktop | |
| parent | 536d6ec8666ed89ed993aabb2a4982f8ebf5861c (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 d5c50aa8b..63b4d1f59 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Dolphin Name[ca]=Dolphin +Name[ca@valencia]=Dolphin Name[cs]=Dolphin Name[de]=Dolphin Name[el]=Dolphin @@ -44,6 +45,7 @@ X-DocPath=dolphin/index.html Categories=Qt;KDE;System;FileTools;FileManager; GenericName=File Manager GenericName[ca]=Gestor de fitxers +GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů GenericName[de]=Dateiverwaltung GenericName[el]=Διαχειριστής αρχείων |