diff options
| author | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
| commit | 438ede27dc86938275d4ea1d8bd57b1e174f6053 (patch) | |
| tree | d870eac6352d0ee940774751e858c414961da660 /src/org.kde.dolphin.desktop | |
| parent | 9c9c9be45db17b236a131f3209327ea79790fd96 (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 694a3d56c..63b72d966 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -10,6 +10,7 @@ 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 @@ -57,6 +58,7 @@ 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 |