Commit f581b4d1 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 4ec60573
......@@ -29,7 +29,7 @@ Name[hi]=इतिहास बाज़ूपट्टी मोड्यूल
Name[hr]=Modul povijesti za bočnu traku
Name[hu]=Előzmények oldalsávmodul
Name[ia]=Modulo de barra lateral de historia
Name[id]=Modul Bilah Sisi Riwayat
Name[id]=Modul BilahSisi Riwayat
Name[is]=Hliðarsláreining ferils
Name[it]=Modulo della barra laterale della cronologia
......@@ -30,7 +30,7 @@ Name[hi]=बाजूपट्टी
Name[hr]=Bočna traka
Name[ia]=Barra lateral
Name[id]=Bilah Sisi
Name[it]=Barra laterale
......@@ -26,7 +26,7 @@ Name[hi]= बाज़ूपट्टी मॉड्यू लगाता ह
Name[hr]=Postavlja modul bočne trake
Name[hu]=Helyek oldalsáv-modul
Name[ia]=Modulo de barra lateral de placias
Name[id]=Tempat Modul Bilah Sisi
Name[id]=Tempat Modul BilahSisi
Name[is]=Hliðarsláreining staða
Name[it]=Modulo della barra laterale delle risorse
......@@ -38,7 +38,7 @@ Name[hr]=Modul za web trake
Name[hsb]=Modul za browserowy bóčny pas
Name[hu]=Webes oldalsáv-modul
Name[ia]=Modulo de barra lateral de Web
Name[id]=Modul Bilah Sisi Web
Name[id]=Modul BilahSisi Web
Name[is]=Hliðarsláreining vefs
Name[it]=Modulo della barra laterale del Web
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