Commit 7fbcd969 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 36e724f1
......@@ -28,7 +28,7 @@ Name[eu]=Mahaigaineko gaia
Name[fi]=Työpöytäteema
Name[fr]=Thème de bureau
Name[ga]=Téama Deisce
Name[gl]=Tema do escritorio
Name[gl]=Tema de escritorio
Name[gu]=ડેસ્કટોપ થીમ
Name[he]=ערכת־הנושא לשולחן־העבודה
Name[hi]=डेस्कटॉप प्रसंग
......
......@@ -17,7 +17,7 @@ Name[eu]=Mahaigaineko gaia
Name[fi]=Työpöytäteema
Name[fr]=Thème de bureau
Name[ga]=Téama Deisce
Name[gl]=Tema do escritorio
Name[gl]=Tema de escritorio
Name[gu]=ડેસ્કટોપ થીમ
Name[he]=ערכת־הנושא לשולחן־העבודה
Name[hi]=डेस्कटॉप प्रसंग
......
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