two merges of the PO files in quick succession
The updates in this PR should be safe, I mean, it's GIT :). And I intend to squash a bit anyway. In case you refer to the upcoming string freeze updates, I'm not concerned at all because I think we will merge this one before (I'd like just to wait for feedback from @codebrainz and/or @b4n). Even if, usually po files are easy to handle.