Commit bc9000bb 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 ef221a23
......@@ -20,6 +20,7 @@ Name[fi]=Toista ääni-CD Dragon Playerissä
Name[fr]=Lire le CD audio avec Dragon Player
Name[gl]=Reproducir un CD de son con Dragon Player
Name[hu]=Hang CD lejátszása a Dragon Playerrel
Name[id]=Mainkan Audio CD menggunakan Dragon Player
Name[is]=Spila CD-hljómdisk með Dragon spilaranum
Name[it]=Leggi CD Audio con Dragon Player
Name[ko]=Dragon Player로 오디오 CD 열기
......@@ -24,6 +24,7 @@ Name[gl]=Abrir co reprodutor de vídeo (Dragon Player)
Name[he]=פתח באמצעות נגן הוידאו (נגן Dragon)
Name[hu]=Megnyitás videolejátszóval (Dragon Player)
Name[ia]=Aperi con Video Player (Dragon Player)
Name[id]=Buka dengan Video Player (Dragon Player)
Name[is]=Opna með vídeóspilara (Dragon spilarinn)
Name[it]=Apri con riproduttore video (Dragon Player)
Name[ja]=動画プレーヤー (Dragon Player) で開く
......@@ -21,6 +21,7 @@ Name[gl]=Compoñente do Dragon Player
Name[he]=רכיב נגן Dragon
Name[hu]=Dragon Player objektum
Name[ia]=Parte de Dragon Player
Name[id]=Dragon Player Part
Name[is]=Dragon spilaraeining
Name[it]=Componente Dragon Player
Name[ja]=Dragon Player コンポーネント
......@@ -72,6 +73,7 @@ Comment[gl]=Reprodutor incrustábel de vídeo
Comment[he]=נגן וידאו מותמע
Comment[hu]=Beágyazható videolejátszó
Comment[ia]=Reproductor de Video Insertabile
Comment[id]=Pemain Video Dapat Dibenamkan
Comment[is]=Ígræðanlegur vídeóspilari
Comment[it]=Lettore video integrabile
......@@ -25,6 +25,7 @@ Name[gl]=Reproducir o DVD co Dragon Player
Name[he]=נגן DVD באמצעות נגן Dragon
Name[hu]=DVD lejátszása a Dragon Playerrel
Name[ia]=Reproduce DVD con Dragon Player
Name[id]=Mainkan DVD dengan Dragon Player
Name[is]=Spila DVD með Dragon spilaranum
Name[it]=Leggi DVD con Dragon Player
Name[ja]=Dragon Player で DVD を再生
......@@ -21,6 +21,7 @@ Name[gl]=Dragon Player
Name[he]=נגן Dragon
Name[hu]=Dragon Player
Name[ia]=Dragon Player
Name[id]=Dragon Player
Name[is]=Dragon spilari
Name[it]=Dragon Player
Name[ja]=Dragon Player
......@@ -73,6 +74,7 @@ GenericName[gl]=Reprodutor de vídeo
GenericName[he]=נגן וידאו
GenericName[ia]=Reproductor de Video
GenericName[id]=Pemain Video
GenericName[it]=Riproduttore video
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