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
9bb2b0a6a8
commit
165448bc7f
|
@ -42,7 +42,7 @@
|
||||||
"Name[pl]": "Widok Dolphina",
|
"Name[pl]": "Widok Dolphina",
|
||||||
"Name[pt]": "Área do Dolphin",
|
"Name[pt]": "Área do Dolphin",
|
||||||
"Name[pt_BR]": "Visualização do Dolphin",
|
"Name[pt_BR]": "Visualização do Dolphin",
|
||||||
"Name[ro]": "Dolphin – Vizualizare",
|
"Name[ro]": "Vizualizare Dolphin",
|
||||||
"Name[ru]": "Представление Dolphin",
|
"Name[ru]": "Представление Dolphin",
|
||||||
"Name[se]": "Dolphinčájeheapmi",
|
"Name[se]": "Dolphinčájeheapmi",
|
||||||
"Name[sk]": "Dolphin pohľad",
|
"Name[sk]": "Dolphin pohľad",
|
||||||
|
|
Loading…
Reference in a new issue