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:
l10n daemon script 2018-04-03 05:28:21 +02:00
parent 8b355027e5
commit 8c8e8f8b47
1 changed files with 1 additions and 1 deletions

View File

@ -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 fail
Comment[id]=Kelola disk, partisi dan sistem file
Comment[it]=Gestisci dischi, partizioni e filesystem
Comment[ja]=ディスク、パーティション、ファイルシステムを管理します
Comment[km]=គ្រប់គ្រង​ថាស ការ​ចែកភាគ​ថាស និង​ប្រព័ន្ធ​ឯកសារ