diff options
| author | l10n daemon script <[email protected]> | 2022-03-29 03:51:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-29 03:51:20 +0000 |
| commit | a8966d230c7bdbca269ddc5b6ec1c71d9c8b2e20 (patch) | |
| tree | 7da40379f702081771386f40cce686d650c88cd3 /src/settings/kcm/kcmdolphinviewmodes.desktop | |
| parent | c7531ba749ebe9d3f908057067156daf22a20b7a (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index b869760e0..6824b74ea 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -3,7 +3,7 @@ Name[ar]=أوضاع المنظور في دولفين Name[ast]=Moos de vista de Dolphin Name[az]=Dolphin baxış rejimi Name[ca]=Modes de vista del Dolphin -Name[ca@valencia]=Modes de vista del Dolphin +Name[ca@valencia]=Modes de vista de Dolphin Name[cs]=Režimy pohledů Dolphinu Name[da]=Dolphins visningstilstande Name[de]=Dolphin-Ansichtsmodi @@ -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]=Este servei permet la configuració dels modes de vista del Dolphin. +Comment[ca@valencia]=Este servei permet la configuració dels modes de vista de 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. |