diff options
| author | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
| commit | 94ba6a0978fe03bcd51a37cd252b1ff2a9efe090 (patch) | |
| tree | 93e4f79346cd98d66b7cbe05b1c4fed55df0f7ac /src/org.kde.dolphin.desktop | |
| parent | c270f4713691e6918054b4bb294e1016cedfbdbe (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 9895e2098..c0ac84347 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -11,6 +11,7 @@ Name[el]=Dolphin Name[en_GB]=Dolphin Name[es]=Dolphin Name[et]=Dolphin +Name[eu]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin @@ -59,6 +60,7 @@ GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager GenericName[es]=Gestor de archivos GenericName[et]=Failihaldur +GenericName[eu]=Fitxategi-kudeatzailea GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros |