mirror of
https://invent.kde.org/system/dolphin
synced 2024-07-15 18:01:11 +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
902e8ee07e
commit
7f562433c0
|
@ -1,7 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Type=Service
|
||||
Name=Dolphin View
|
||||
Name[ar]=منظور دولفين
|
||||
Name[ar]=عرض دولفين
|
||||
Name[ast]=Vista de Dolphin
|
||||
Name[az]=Dolphin görünüşü
|
||||
Name[ca]=Vista del Dolphin
|
||||
|
|
Loading…
Reference in a new issue