Commit 8fa8ca1d authored by Script Kiddy's avatar Script Kiddy

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"
parent 2aa494d6
......@@ -40,7 +40,7 @@ Name[hr]=Instaliraj…
Name[hsb]=instalować...
Name[hu]=Telepítés...
Name[ia]=Installa ...
Name[id]=Pasang...
Name[id]=Instal...
Name[is]=Setja upp...
Name[it]=Installa...
Name[ja]=インストール...
......
......@@ -86,7 +86,7 @@ Comment[fr]=Installation, aperçu et suppression de polices
Comment[gl]=Instalación, vista previa e desinstalación de tipos de letra
Comment[he]=Font Installation, Preview and Removal
Comment[hu]=Betűkészlet-telepítés, előnézet és eltávolítás
Comment[id]=Pemasangan Fonta, Pratinjau dan Pencopotan
Comment[id]=Penginstalan Fonta, Pratinjau dan Pencopotan
Comment[it]=Installazione dei caratteri, anteprima e rimozione
Comment[ko]=글꼴 설치, 미리 보기, 삭제
Comment[lt]=Šriftų diegimas, peržiūra ir šalinimas
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment