Merge with stable

--HG--
branch : jp

diff --cc .hgtags
index 3f1c304,b2da431..8cf14f8
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -410,10 -410,5 +410,11 @@@ f4a3ba4d97f6a9b7d74e6101b890bea3d357aef
  7d1863b8c6867aef0407702f6d19cfbe608375f4 2.15.4
  42fd7355d3f7b3fde308bb641a5324ef4e60bef1 2.15.5
  bc5f0fce716cba3cf2ff64235b189af4c83dd894 2.16.0
 +9d0258cda6e31dde773a6bacaa3d3caeddfbf206 2.16.0+-jp-1
 +f47f562b939274290c973c8646ff26acb99cb27d 2.16.0+-jp-3
 +3b9d8019a04f3a591d11b5cbe3ca91fc25117261 2.16.0+-jp-7
 +da4da0305ebbbc4d40cce92105658a672600dacd 2.16.0+-jp-13
  6d290fd0b89312c866a3f003d16c5de36d872c27 2.16.2
 +0f059e587d346d6b37bca72fded057e5d6eb700a 2.16.2+-jp-3
 +ffe2104428ab41fde6562bf882ee66259224fc45 2.16.2+-jp-7
+ d2945a864a2437083f01a3d8d9a119fcff7d43c8 2.16.3

diff --cc Translations/WinMerge/Lithuanian.po
Simple merge