From f8947668bfbd7d516730e57e5ae284b44d0957e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Wed, 11 Jan 2017 18:21:28 +0100
Subject: [PATCH] Change version to 1.8.12, update NEWS

---
 .travis.yml                      | 2 +-
 NEWS                             | 9 +++++++++
 Poedit.xcodeproj/project.pbxproj | 4 ++--
 configure.ac                     | 4 ++--
 scripts/refresh-pot.sh           | 2 +-
 src/version.h                    | 4 ++--
 win32/poedit.iss                 | 4 ++--
 win32/version.props              | 2 +-
 8 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6b3cf49fe..2442dad98c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ deploy:
     api_key:
         secure: fkelxNMcGoNY4MT30dEiEUE53cMkhtmr44Y7iSEkOGmfeG9ReUqVIk1nd7027iehzdhhcov57XwHg49KA+AWpQGvEbLkRNRazOxSGFL9o/P/Rzft/tvKP0sxcRF5RUVo0b5J5wlsIKSlbjDqGu9CM+G4eyK0D2jo/XPzsv9akKQ=
     skip_cleanup: true
-    file: poedit-1.8.11.tar.gz
+    file: poedit-1.8.12.tar.gz
     on:
         repo: vslavik/poedit
         tags: true
diff --git a/NEWS b/NEWS
index 373ec7fa67..8e37094f3b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,13 @@
 
+Version 1.8.12
+--------------
+
+- Fixed previous msgid display.
+- Fixed Find to correctly highlight text with "whole words only" enabled.
+- [Windows] Fixed to accelerators and suggestions interaction with selection.
+- Poedit now passes --previous to msgmerge.
+
+
 Version 1.8.11
 --------------
 
diff --git a/Poedit.xcodeproj/project.pbxproj b/Poedit.xcodeproj/project.pbxproj
index c3b5df8a2c..f3206d0225 100644
--- a/Poedit.xcodeproj/project.pbxproj
+++ b/Poedit.xcodeproj/project.pbxproj
@@ -1706,7 +1706,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
 				POEDIT_FEATURES = "";
-				POEDIT_VERSION = 1.8.11;
+				POEDIT_VERSION = 1.8.12;
 				SDKROOT = macosx;
 				WX_DEFINES = "__WXOSX_COCOA__ __WX__ __WXMAC_XCODE__=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1";
 			};
@@ -1770,7 +1770,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				POEDIT_FEATURES = "";
-				POEDIT_VERSION = 1.8.11;
+				POEDIT_VERSION = 1.8.12;
 				SDKROOT = macosx;
 				WX_DEFINES = "__WXOSX_COCOA__ __WX__ __WXMAC_XCODE__=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1";
 			};
diff --git a/configure.ac b/configure.ac
index e6d5867a64..ecfa6a6974 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 
-AC_INIT([poedit], [1.8.11], [help@poedit.net])
-PACKAGE_SHORT_VERSION=1.8.11
+AC_INIT([poedit], [1.8.12], [help@poedit.net])
+PACKAGE_SHORT_VERSION=1.8.12
 AC_SUBST(PACKAGE_SHORT_VERSION)
 
 AC_CONFIG_AUX_DIR([admin])
diff --git a/scripts/refresh-pot.sh b/scripts/refresh-pot.sh
index c4fad7ddf1..f9e58a12bf 100755
--- a/scripts/refresh-pot.sh
+++ b/scripts/refresh-pot.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-PACKAGE_SHORT_VERSION=1.8.11
+PACKAGE_SHORT_VERSION=1.8.12
 
 [ -n "${WXRC}" ] || WXRC=wxrc
 
diff --git a/src/version.h b/src/version.h
index cfec0f2a2a..a9a8188372 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define POEDIT_VERSION           "1.8.11"
-#define POEDIT_VERSION_WIN        1,8,11
+#define POEDIT_VERSION           "1.8.12"
+#define POEDIT_VERSION_WIN        1,8,12
 
 #endif // _VERSION_H_
diff --git a/win32/poedit.iss b/win32/poedit.iss
index b967c56a20..ad5b008059 100644
--- a/win32/poedit.iss
+++ b/win32/poedit.iss
@@ -30,8 +30,8 @@
 
 #include "../" + CONFIG + "/git_build_number.h"
 
-#define VERSION          "1.8.11"
-#define VERSION_FULL     "1.8.11"
+#define VERSION          "1.8.12"
+#define VERSION_FULL     "1.8.12"
 #define VERSION_WIN      VERSION + "." + Str(POEDIT_GIT_BUILD_NUMBER)
 
 #ifndef CRT_REDIST
diff --git a/win32/version.props b/win32/version.props
index e86c4f0ba0..c533d441ce 100644
--- a/win32/version.props
+++ b/win32/version.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PoeditVersion>1.8.11</PoeditVersion>
+    <PoeditVersion>1.8.12</PoeditVersion>
   </PropertyGroup>
 </Project>