diff options
| author | l10n daemon script <[email protected]> | 2015-03-15 09:54:53 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-03-15 09:54:53 +0000 |
| commit | a7484d2ce51a6734a59a7b3f3ad9ef43c54717ee (patch) | |
| tree | 62bdee7282cac2994ff94f208593cf24b44d9d01 /src/org.kde.dolphin.desktop | |
| parent | 068c6e73209dd6e3f14e9ab8ef573a5dbdb71a2d (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 0fbba44a1..36a9f6a9f 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[en_GB]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin @@ -30,6 +31,7 @@ GenericName=File Manager GenericName[ca]=Gestor de fitxers GenericName[cs]=Správce souborů GenericName[de]=Dateiverwaltung +GenericName[en_GB]=File Manager GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros |