diff options
| author | l10n daemon script <[email protected]> | 2020-09-14 06:15:19 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-14 06:15:19 +0200 |
| commit | 1d47e9691330ad40113e3652ab2f158a25665ece (patch) | |
| tree | 7594ca25a09d8ec6f7c618322759486a709b5738 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 7d3e9f726b0cb4be651fc2f62ebf709288e30769 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 0747ff430..49253cd9e 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -80,6 +80,7 @@ Comment[pa]=ਇਹ ਸਰਵਿਸ ਆਮ ਡਾਲਫਿਨ ਸੈਟਿੰਗ Comment[pl]=Ta usługa pozwala na ogólne ustawienie Dolphina. Comment[pt]=Este serviço permite a configuração das definições gerais do Dolphin. Comment[pt_BR]=Este serviço permite configurar as opções gerais do Dolphin. +Comment[ro]=Acest serviciu permite configurarea opțiunilor generale Dolphin. Comment[ru]=Эта служба позволяет настраивать основные параметры Dolphin Comment[sk]=Táto služba umožňuje všeobecné nastavenie Dolphinu. Comment[sl]=Ta storitev omogoča spreminjanje splošnih nastavitev programa Dolphin. |