Commit 005bd3be 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 a69f20a0
...@@ -30,6 +30,7 @@ Name[fr]=Formats ...@@ -30,6 +30,7 @@ Name[fr]=Formats
Name[gl]=Formatos Name[gl]=Formatos
Name[he]=תבניות Name[he]=תבניות
Name[hu]=Formátumok Name[hu]=Formátumok
Name[id]=Format Name[id]=Format
Name[is]=Snið Name[is]=Snið
Name[it]=Formati Name[it]=Formati
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