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/kcmdolphinnavigation.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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 522fb56dc..0038822e0 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -18,6 +18,7 @@ Name[lt]=Dolphin navigacija Name[nb]=Navigasjon i Dolphin Name[nl]=Dolphin-navigatie Name[nn]=Navigasjon i Dolphin +Name[pa]=ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Dolphina Name[pt]=Navegação do Dolphin Name[pt_BR]=Navegação do Dolphin @@ -101,6 +102,7 @@ Name[lt]=Navigacija Name[nb]=Navigasjon Name[nl]=Navigatie Name[nn]=Navigasjon +Name[pa]=ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Name[pt]=Navegação Name[pt_BR]=Navegação @@ -174,6 +176,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 |