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/org.kde.dolphin.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/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 94682ce6d..167bbd06f 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -32,6 +32,7 @@ Name[pa]=ਡਾਲਫਿਨ Name[pl]=Dolphin Name[pt]=Dolphin Name[pt_BR]=Dolphin +Name[ro]=Dolphin Name[ru]=Dolphin Name[se]=Dolphin Name[sk]=Dolphin @@ -85,6 +86,7 @@ GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ GenericName[pl]=Zarządzanie plikami GenericName[pt]=Gestor de Ficheiros GenericName[pt_BR]=Gerenciador de arquivos +GenericName[ro]=Gestionar de fișiere GenericName[ru]=Диспетчер файлов GenericName[se]=Fiilagieđahalli GenericName[sk]=Správca súborov |