diff options
| author | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-09-08 12:47:01 +0000 |
| commit | c9770e60839f60ffa29e56e9785a9a36b3d4a90c (patch) | |
| tree | 6e191d096a8388e677e7dc3556aa77daf7ac1964 /src/org.kde.dolphin.desktop | |
| parent | 2a18f450254e5d58152e747fbc150747cd34e218 (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 0d25c1750..9c9408341 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -8,6 +8,7 @@ Name[es]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin +Name[hu]=Dolphin Name[ia]=Dolphin Name[id]=Dolphin Name[it]=Dolphin @@ -48,6 +49,7 @@ GenericName[es]=Gestor de archivos GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros +GenericName[hu]=Fájlkezelő GenericName[ia]=Gerente de file GenericName[id]=Manajer Berkas GenericName[it]=Gestore dei file |