Commit d666a74b 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 0c92d4d0
......@@ -4,6 +4,7 @@ Name[ca]=Prova el tàctil
Name[ca@valencia]=Prova el tàctil
Name[es]=Prueba táctil
Name[nl]=Aanraaktest
Name[pl]=Próba dotyku
Name[pt]=Teste de Toque
Name[sv]=Beröringsprov
Name[uk]=Тестування дотику
......@@ -19,6 +20,7 @@ GenericName[ca@valencia]=Terminal
GenericName[de]=Terminal
GenericName[es]=Terminal
GenericName[nl]=Terminal
GenericName[pl]=Terminal
GenericName[pt]=Terminal
GenericName[sv]=Terminal
GenericName[uk]=Термінал
......
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