Commit ff20b6b3 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 ba5750ad
......@@ -36,6 +36,7 @@ Name[et]=Viga kirjade kontrollimisel
Name[fr]=Erreur lors de la vérification du courriel
Name[ia]=Error durante verification de e-posta
Name[it]=Errore durante il controllo della posta
Name[ja]=メールのチェック中にエラー
Name[kk]=Поштаны тексергенде қате орын алды
Name[km]=កំហុស​ខណៈពេល​ពិនិត្យ​មើល​សំបុត្រ​ថ្មី
Name[lv]=Kļūda pārbaudot pastu
......@@ -72,6 +73,7 @@ Comment[et]=Uute kirjade kontrollimisel tekkis viga
Comment[fr]=Il y a eu une erreur lors de la vérification du courriel
Comment[ia]=Il habeva un error durante verification pro nove e-posta
Comment[it]=Si è verificato un errore durante il controllo dei nuovi messaggi di posta
Comment[ja]=新着メールのチェック中にエラーが発生しました
Comment[kk]=Жаңа пошта бар ма деп тексергенде бір қате орын алды
Comment[km]=មាន​កំហុស​ខណៈពេល​ពិនិត្យ​មើល​សំបុត្រ​ថ្មី
Comment[lv]=Gadījās kļūda pārbaudot ienākošo pastu
......
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