Commit 5b1d3ef2 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 3dcf501e
......@@ -32,7 +32,7 @@ Name[ga]=Réamhamharc ar Phictiúir i gComhráite
Name[gl]=Previsualizar as imaxes nas conversas
Name[hr]=Pregled slika u razgovorima
Name[hu]=Előnézeti képek csevegésekben
Name[ia]=Vista preliminar de picturas in conversationes in directo
Name[ia]=Vista preliminari de picturas in conversationes in directo
Name[it]=Anteprima di immagini in chat
Name[ja]=チャット中の画像のプレビュー
Name[kk]=Чаттарда суреттерді қарау
......@@ -86,7 +86,7 @@ Comment[hi]=गपशप में छवियों के पूर्वा
Comment[hne]=गपसप मं फोटू मन के प्रिव्यू देखाथे
Comment[hr]=Prikazuje pregled slika u razgovorima
Comment[hu]=Megjeleníti a csevegésekben előforduló képek előnézetét
Comment[ia]=Monstra un vista preliminar de picturas in conversationes in directo
Comment[ia]=Monstra un vista preliminari de picturas in conversationes in directo
Comment[it]=Mostra un'anteprima di immagini in chat
Comment[ja]=チャットに画像のプレビューを表示します
Comment[kk]=Әңгіме-дүкендерде суреттерін қарау
......
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