diff options
| author | l10n daemon script <[email protected]> | 2020-09-01 06:25:15 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-01 06:25:15 +0200 |
| commit | f15f74e241ec4bd1f271e2dd7245509c565e6c02 (patch) | |
| tree | e17bfed0ffd140a87ec44de4c6aebfe96ce49c3f /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | 7479fef79962cede2c5d5ad7383c11a83c4f978d (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 62e8ca040..eeb28fe86 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -31,6 +31,7 @@ Name[pa]=ਡਾਲਫਿਨ ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Dolphina Name[pt]=Navegação do Dolphin Name[pt_BR]=Navegação do Dolphin +Name[ro]=Dolphin – Navigare Name[ru]=Навигация в Dolphin Name[se]=Dolphinnavigašuvdna Name[sk]=Navigácia Dolphinu @@ -136,6 +137,7 @@ Name[pa]=ਨੇਵੀਗੇਸ਼ਨ Name[pl]=Nawigacja Name[pt]=Navegação Name[pt_BR]=Navegação +Name[ro]=Navigare Name[ru]=Навигация Name[se]=Navigašuvdna Name[sk]=Navigácia @@ -231,6 +233,7 @@ 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 +X-KDE-Keywords[ro]=gestionar de fișiere X-KDE-Keywords[ru]=диспетчер файлов X-KDE-Keywords[sk]=správca súborov X-KDE-Keywords[sl]=upravljalnik datotek |