diff options
| author | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-30 10:26:25 +0000 |
| commit | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (patch) | |
| tree | deed68addb9d84edd3450a6d34102b222db13b1c /src/org.kde.dolphin.desktop | |
| parent | 090f3e90ea4ce43c6d5e90c7b82c13a52222c72c (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 9340021cf..63b4d1f59 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -3,7 +3,6 @@ Name=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin -Name[da]=Dolphin Name[de]=Dolphin Name[el]=Dolphin Name[en_GB]=Dolphin @@ -48,7 +47,6 @@ GenericName=File Manager GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů -GenericName[da]=Filhåndtering GenericName[de]=Dateiverwaltung GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager |