Commit 32c9f8a7 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 6845ea04
...@@ -251,7 +251,7 @@ Name[pl]=Sprawdź pocztę ...@@ -251,7 +251,7 @@ Name[pl]=Sprawdź pocztę
Name[pt]=Verificar o Correio Name[pt]=Verificar o Correio
Name[pt_BR]=Verificar e-mails Name[pt_BR]=Verificar e-mails
Name[ru]=Проверить почту Name[ru]=Проверить почту
Name[sk]=S&kontrolovať poštu Name[sk]=Skontrolovať poštu
Name[sl]=Preveri pošto Name[sl]=Preveri pošto
Name[sr]=Провери пошту Name[sr]=Провери пошту
Name[sr@ijekavian]=Провери пошту Name[sr@ijekavian]=Провери пошту
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