diff options
| author | l10n daemon script <[email protected]> | 2016-05-29 12:20:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-05-29 12:20:08 +0000 |
| commit | fe6a7ac9f8b5ce6180fe265ac95b524ecc7805f6 (patch) | |
| tree | 5eeee98ea7fb438017c7d93dd98d5065a33a1ba5 /src/org.kde.dolphin.desktop | |
| parent | bed16191b5e9253d8658c0dac0d336b3dab5e0e3 (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 7b8e19414..694a3d56c 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -5,6 +5,7 @@ Name[ast]=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin +Name[da]=Dolphin Name[de]=Dolphin Name[el]=Dolphin Name[en_GB]=Dolphin @@ -51,6 +52,7 @@ GenericName[ast]=Xestor de ficheros 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 |