kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-15 18:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2022-04-18 02:45:08 +00:00
parent 06bd5b2ee9
commit 4012ea30c9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/kcm/kcmdolphingeneral.desktop
View file

@ -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 la configuració general de Dolphin.
Comment[ca@valencia]=Este servei permet 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.