diff options
| author | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
| commit | 0fc2c24039bc0cf7ff0f4db4697254fea6947eeb (patch) | |
| tree | 9ba487046c78c781cbc9db8aeb84ddbda1b9e5ad /src/org.kde.dolphin.desktop | |
| parent | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (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 63b4d1f59..b23fec03c 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Dolphin +Name[ast]=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin @@ -44,6 +45,7 @@ Type=Application X-DocPath=dolphin/index.html Categories=Qt;KDE;System;FileTools;FileManager; GenericName=File Manager +GenericName[ast]=Xestor de ficheros GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů |