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
f227a81ff4
commit
7dd9e17a8c
|
@ -122,7 +122,7 @@ Comment[fr]=Gère les disques, partitions et systèmes de fichiers
|
|||
Comment[ga]=Bainistigh dioscaí, deighiltí agus córais comhad
|
||||
Comment[gl]=Xestiona os discos, particións e o sistemas de ficheiros
|
||||
Comment[hu]=Lemezek, partíciók, és fájlrendszerek kezelése
|
||||
Comment[id]=Kelola disk, partisi dan sistem file
|
||||
Comment[id]=Kelola disk, partisi dan sistem fail
|
||||
Comment[it]=Gestisci dischi, partizioni e filesystem
|
||||
Comment[ja]=ディスク、パーティション、ファイルシステムを管理します
|
||||
Comment[km]=គ្រប់គ្រងថាស ការចែកភាគថាស និងប្រព័ន្ធឯកសារ
|
||||
|
|
Loading…
Reference in New Issue