diff options
| author | l10n daemon script <[email protected]> | 2022-03-29 02:21:23 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-03-29 02:21:23 +0000 |
| commit | 447c35868c6268789e8f2ae0abecd28df02029d8 (patch) | |
| tree | 044ad27ca6bee897246b15b827ac1be605ea2091 /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | d658c7e09024db81266d210fa8932cb5ab2d6190 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 90dd868ad..f1bb07f9a 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -3,7 +3,7 @@ Name[ar]=دولفين العامّ Name[ast]=Axustes xenerales de Dolphin Name[az]=Əsas Dolphin parametrləri Name[ca]=General del Dolphin -Name[ca@valencia]=General del Dolphin +Name[ca@valencia]=General de Dolphin Name[cs]=Obecný Dolphin Name[da]=Dolphin generelt Name[de]=Dolphin allgemein @@ -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]=Este servei permet la configuració de l'arranjament general del Dolphin. +Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general de 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. |