diff options
| author | l10n daemon script <[email protected]> | 2015-11-01 10:40:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-01 10:40:09 +0000 |
| commit | 7b273bb4c66de0d2c4f53bcffa418839eb3b5972 (patch) | |
| tree | 1ef2d94f67e6dec63de0dba6e1559853307133f4 /src/org.kde.dolphin.desktop | |
| parent | 07dae709d9fe68283caa71d13468b3edc4f0e2be (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 ed13e38fe..d5c50aa8b 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -19,6 +19,7 @@ Name[lt]=Dolphin Name[nb]=Dolphin Name[nl]=Dolphin Name[nn]=Dolphin +Name[pa]=ਡਾਲਫਿਨ Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin @@ -61,6 +62,7 @@ GenericName[lt]=Failų tvarkyklė GenericName[nb]=Filbehandler GenericName[nl]=Bestandsbeheerder GenericName[nn]=Filhandsamar +GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos |