mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +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
496a2cce6b
commit
32db592309
|
@ -87,10 +87,10 @@ Name[ru]=Значки
|
|||
Name[se]=Govažat
|
||||
Name[sk]=Ikony
|
||||
Name[sl]=Ikone
|
||||
Name[sr]=Иконе
|
||||
Name[sr@ijekavian]=Иконе
|
||||
Name[sr@ijekavianlatin]=Ikone
|
||||
Name[sr@latin]=Ikone
|
||||
Name[sr]=Иконице
|
||||
Name[sr@ijekavian]=Иконице
|
||||
Name[sr@ijekavianlatin]=Ikonice
|
||||
Name[sr@latin]=Ikonice
|
||||
Name[sv]=Ikoner
|
||||
Name[tr]=Simgeler
|
||||
Name[uk]=Піктограми
|
||||
|
|
Loading…
Reference in a new issue