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
d63d53eff1
commit
51fcd600a8
|
@ -97,7 +97,7 @@ Name[ie]=Compact
|
||||||
Name[is]=Þétt
|
Name[is]=Þétt
|
||||||
Name[it]=Compatta
|
Name[it]=Compatta
|
||||||
Name[ja]=コンパクト
|
Name[ja]=コンパクト
|
||||||
Name[ka]=დაპატარავება
|
Name[ka]=კომპაქტური
|
||||||
Name[ko]=축소됨
|
Name[ko]=축소됨
|
||||||
Name[lt]=Kompaktiškas
|
Name[lt]=Kompaktiškas
|
||||||
Name[lv]=Kompakts
|
Name[lv]=Kompakts
|
||||||
|
|
Loading…
Reference in a new issue