kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues 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 2015-11-21 18:58:19 +00:00
parent ed3bb94ea0
commit 0587f994dc
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/settings/kcm/kcmdolphinservices.desktop
View file

@ -47,6 +47,7 @@ X-KDE-PluginKeyword=dolphinservices
X-KDE-ParentApp=kcontrol
X-DocPath=dolphin/index.html#preferences-dialog-services
Name=Services
Name[ast]=Servicios
Name[ca]=Serveis
Name[ca@valencia]=Serveis
Name[cs]=Služby