<p>Well.. Actually I was thinking about running a git rebase against upstream branch to get rid of e.g. the merge commit. Anyway, going to merge it like this. Won't hurt anybody beside the little noise causing it. And I'm happy for the translation update so users can use geany in their mother language maybe.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/1676#issuecomment-342458690">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJ0rgiRNG1mMXnvS2GvBEn7xIsKp4ks5s0EMxgaJpZM4QUXen">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ9uLe1OEt0vzeSbTPFWqecwb0CbKks5s0EMxgaJpZM4QUXen.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany/pull/1676#issuecomment-342458690"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/geany/geany","title":"geany/geany","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany"}},"updates":{"snippets":[{"icon":"PERSON","message":"@frlan in #1676: Well.. Actually I was thinking about running a git rebase against upstream branch to get rid of e.g. the merge commit. Anyway, going to merge it like this. Won't hurt anybody beside the little noise causing it. And I'm happy for the translation update so users can use geany in their mother language maybe. "}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany/pull/1676#issuecomment-342458690"}}}</script>