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/kcmdolphinviewmodes.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/kcmdolphinviewmodes.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 11c9bd0d4..d869acfdc 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -101,6 +101,7 @@ Name[lt]=Rodymo būdai Name[nb]=Visningsmåter Name[nl]=Weergavemodi Name[nn]=Visingsmodusar +Name[pa]=ਵੇਖਣ ਢੰਗ Name[pl]=Tryby widoku Name[pt]=Modos de Visualização Name[pt_BR]=Modos de exibição @@ -174,6 +175,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 |