mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
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"
This commit is contained in:
parent
ed3bb94ea0
commit
0587f994dc
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue