diff options
| author | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
| commit | 07dae709d9fe68283caa71d13468b3edc4f0e2be (patch) | |
| tree | f317df1201588aa67e72ee524db78360b57691c2 /src/org.kde.dolphin.desktop | |
| parent | f5fd8e5cfb43deb1ccb0fef76e335afbde088965 (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 9c9408341..ed13e38fe 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -3,6 +3,7 @@ Name=Dolphin Name[ca]=Dolphin Name[cs]=Dolphin Name[de]=Dolphin +Name[el]=Dolphin Name[en_GB]=Dolphin Name[es]=Dolphin Name[fi]=Dolphin @@ -44,6 +45,7 @@ GenericName=File Manager GenericName[ca]=Gestor de fitxers GenericName[cs]=Správce souborů GenericName[de]=Dateiverwaltung +GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager GenericName[es]=Gestor de archivos GenericName[fi]=Tiedostonhallinta |