diff options
| author | l10n daemon script <[email protected]> | 2023-02-12 02:02:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-02-12 02:02:18 +0000 |
| commit | d185e218871f7fb8016291994564bf266dd5df70 (patch) | |
| tree | 49ffdd0e941e5d07b1def7dd1d6a09fe436bad84 /src/org.kde.dolphin.desktop | |
| parent | f885d2f1be6c52be33008f4afe95291d82c3618f (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 c0e72d942..8b957e66e 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -11,6 +11,7 @@ Name[da]=Dolphin Name[de]=Dolphin Name[el]=Dolphin Name[en_GB]=Dolphin +Name[eo]=Dolfin Name[es]=Dolphin Name[et]=Dolphin Name[eu]=Dolphin @@ -73,6 +74,7 @@ GenericName[da]=Filhåndtering GenericName[de]=Dateiverwaltung GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager +GenericName[eo]=Dosiermastrumilo GenericName[es]=Gestor de archivos GenericName[et]=Failihaldur GenericName[eu]=Fitxategi-kudeatzailea |