diff options
| author | l10n daemon script <[email protected]> | 2022-03-20 03:39:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-20 03:39:12 +0000 |
| commit | 109eb3334d14a39cb5c87897042a57b9da255cfe (patch) | |
| tree | 9775bead193d7bfd49bfe66328014e78f8eafa27 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 3c1ebfcfb19afc2a4f5f9ebe0e67689cef0253c1 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 2695d49ce..90dd868ad 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -57,7 +57,7 @@ Comment[ar]=تسمح هذه الخدمة بضبط إعدادات دولفين ا Comment[ast]=Esti serviciu permite la configuración de los axustes xenerales de Dolphin. Comment[az]=Bu xidmət əsas Dolphin parametrlərini ayarlamağa imkan verir. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. -Comment[ca@valencia]=Aquest servei permet la configuració de l'arranjament general del Dolphin. +Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general del Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. Comment[da]=Denne tjeneste muliggør konfiguration af generelle Dolphin-indstillinger. Comment[de]=Mit diesem Dienst können allgemeine Einstellungen von Dolphin eingerichtet werden. |