Commit bfab81f4 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 48f0599f
......@@ -116,7 +116,7 @@ Name[sv]=Ny skärmbild sparad
Name[tr]=Yeni Ekran Görüntüsü Kaydedildi
Name[uk]=Збереженого нових знімок
Name[x-test]=xxNew Screenshot Savedxx
Name[zh_CN]=新屏幕截图已保存
Name[zh_CN]=已保存新屏幕截图
Name[zh_TW]=螢幕快照已儲存
Comment=A new screenshot was captured and saved
Comment[ar]=أُخذت لقطة جديدة وحُفظت
......@@ -155,6 +155,6 @@ Comment[sv]=En ny skärmbild togs och sparades
Comment[tr]=Yeni bir ekran görüntüsü yakalandı ve kaydedildi
Comment[uk]=Було створено і збережено новий знімок
Comment[x-test]=xxA new screenshot was captured and savedxx
Comment[zh_CN]=新屏幕截图已截取并保存
Comment[zh_CN]=已截取并保存一张新的屏幕截图
Comment[zh_TW]=新的螢幕快照已擷取並儲存
Action=Popup
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