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/kcmdolphinviewmodes.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/kcmdolphinviewmodes.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 1e8cc1043..b869760e0 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -56,7 +56,7 @@ Comment[ar]=تسمح هذه الخدمة بضبط أوضاع المنظور في Comment[ast]=Esti serviciu permite la configuración de los moos de vista de Dolphin. Comment[az]=Bu xidmət Dolphin baxış rejimini tənzimləməyə imkan verir Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphin. -Comment[ca@valencia]=Aquest servei permet la configuració dels modes de vista del Dolphin. +Comment[ca@valencia]=Este servei permet la configuració dels modes de vista del Dolphin. Comment[cs]=Tato služba umožňuje nastavení režimů pohledu Dolphinu. Comment[da]=Denne tjeneste muliggør konfiguration af Dolphins visningstilstande. Comment[de]=Mit diesem Dienst können Dolphin-Ansichtsmodi eingerichtet werden. |