diff options
| author | l10n daemon script <[email protected]> | 2022-04-07 02:58:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-07 02:58:35 +0000 |
| commit | e50ff16e6871f6322cad23d8eb907b2f892c9289 (patch) | |
| tree | 929ab3877efa982cb20c9a82ab18f3685b0e1f83 | |
| parent | 2a3b731ca2b13c518c92951e2d1efa9a53dd70b3 (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"
| -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 f1bb07f9a..b428367e8 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]=Este servei permet la configuració de l'arranjament general de Dolphin. +Comment[ca@valencia]=Este servei permet la configuració de la configuració 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. |