Commit d36aadca authored by Script Kiddy's avatar Script Kiddy
Browse files

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 7910792d
......@@ -17,7 +17,7 @@ Name[fr]=Gestionnaire de tâches par icônes
Name[gl]=Xestor de tarefas de só iconas
Name[he]=מנהל משימות של סמלים בלבד
Name[hu]=Ikonos feladatkezelő
Name[id]=Pengelola Tugas Hanya Ikon
Name[id]=Task Manager Hanya Ikon
Name[is]=Verkefnastjóri einungis með táknmyndum
Name[it]=Gestore dei processi solo icone
......@@ -32,7 +32,7 @@ Name[hr]=Upravljanje zadacima
Name[hsb]=Rjadowar nadawkow
Name[ia]=Gerente de carga
Name[id]=Pengelola Tugas
Name[id]=Task Manager
Name[it]=Gestore dei processi
Supports Markdown
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