diff options
| author | l10n daemon script <[email protected]> | 2016-01-15 09:54:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-01-15 09:54:42 +0000 |
| commit | b336066e1d3b605853fa3502d31951ff47cc33f0 (patch) | |
| tree | 6101c2efd2efa59941bb8564b61b3b4d9d98e103 /src/org.kde.dolphin.desktop | |
| parent | adb7c47885a805c1e8587d24d4767fde22ea15b5 (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 89234ad87..b23fec03c 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -8,7 +8,6 @@ Name[de]=Dolphin Name[el]=Dolphin Name[en_GB]=Dolphin Name[es]=Dolphin -Name[et]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin @@ -54,7 +53,6 @@ GenericName[de]=Dateiverwaltung GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager GenericName[es]=Gestor de archivos -GenericName[et]=Failihaldur GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros |