am 21c12e8c: (-s ours) am 54fbb3a6: (-s ours) am e8137079: (-s ours) Import translati...
Baligh Uddin [Sun, 6 Jul 2014 22:07:35 +0000 (22:07 +0000)]
* commit '21c12e8c01d9c9e8f3fefc9a7aa337d3036bac85':
  Import translations. DO NOT MERGE


Trivial merge