diff options
| author | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
| commit | 1c1efb983c60ea57422317186047f744e23df114 (patch) | |
| tree | ee5cf5fa6ff7a7094138758ce0138ca1a257ae52 /src/org.kde.dolphin.desktop | |
| parent | 586252341ea69a60b64f404dd23ef93e59c1e16c (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 2d099cd6c..ea802b431 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -4,6 +4,7 @@ Name[ca]=Dolphin Name[cs]=Dolphin Name[de]=Dolphin Name[en_GB]=Dolphin +Name[es]=Dolphin Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin @@ -40,6 +41,7 @@ GenericName[ca]=Gestor de fitxers GenericName[cs]=Správce souborů GenericName[de]=Dateiverwaltung GenericName[en_GB]=File Manager +GenericName[es]=Gestor de archivos GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros |