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/settings/kcm/kcmdolphingeneral.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/settings/kcm/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index dcd2ff9f9..182d09fa8 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -18,6 +18,7 @@ Name[lt]=Dolphin bendrieji Name[nb]=Dolphin generelt Name[nl]=Dolphin algemeen Name[nn]=Generelt for Dolphin +Name[pa]=ਡਾਲਫਿਨ ਆਮ Name[pl]=Ustawienia Dolphina Name[pt]=Geral do Dolphin Name[pt_BR]=Geral do Dolphin @@ -102,6 +103,7 @@ Name[lt]=Bendra Name[nb]=Generelt Name[nl]=Algemeen Name[nn]=Generelt +Name[pa]=ਆਮ Name[pl]=Ogólne Name[pt]=Geral Name[pt_BR]=Geral @@ -172,6 +174,7 @@ X-KDE-Keywords[lt]=Failų tvarkyklė X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ X-KDE-Keywords[pl]=zarządzanie plikami X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos |