diff --git a/.travis.yml b/.travis.yml
index 5fc0c60f0d..8aca2e3ddc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ deploy:
api_key:
secure: fkelxNMcGoNY4MT30dEiEUE53cMkhtmr44Y7iSEkOGmfeG9ReUqVIk1nd7027iehzdhhcov57XwHg49KA+AWpQGvEbLkRNRazOxSGFL9o/P/Rzft/tvKP0sxcRF5RUVo0b5J5wlsIKSlbjDqGu9CM+G4eyK0D2jo/XPzsv9akKQ=
skip_cleanup: true
- file: poedit-2.0beta2.tar.gz
+ file: poedit-2.0.tar.gz
on:
repo: vslavik/poedit
tags: true
diff --git a/NEWS b/NEWS
index 373ec7fa67..6ee602dba9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,28 @@
+Version 2.0
+-----------
+
+- Revamped user interface.
+- Syntax highlighting for markup and special characters.
+- Warnings are now shown for common translation mistakes.
+- More robust pre-translation (previous "Fill missing translations from TM").
+- "Fuzzy" was renamed "Needs work" thorough to be more accessible to
+ gettext non-experts.
+- xgettext invocation can now be customized on per-file basis.
+- Files opened from Crowdin now auto-sync on save.
+- New Linux icon.
+- Many small improvements all over.
+
+
+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 68f63ef61d..b12780946b 100644
--- a/Poedit.xcodeproj/project.pbxproj
+++ b/Poedit.xcodeproj/project.pbxproj
@@ -1667,7 +1667,7 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-fvisibility=hidden";
POEDIT_FEATURES = "";
- POEDIT_VERSION = 2.0beta2;
+ POEDIT_VERSION = 2.0;
SDKROOT = macosx;
WX_DEFINES = "__WXOSX_COCOA__ __WX__ __WXMAC_XCODE__=1 wxUSE_UNICODE_UTF8=0 wxUSE_UNICODE_WCHAR=1";
};
@@ -1728,7 +1728,7 @@
LIBRARY_SEARCH_PATHS = "$(DEPS_BUILD_DIR)/icu/lib";
MACOSX_DEPLOYMENT_TARGET = 10.10;
POEDIT_FEATURES = "";
- POEDIT_VERSION = 2.0beta2;
+ POEDIT_VERSION = 2.0;
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 42a8f511a6..3ab1ff6a98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([poedit], [2.0beta2], [help@poedit.net])
+AC_INIT([poedit], [2.0], [help@poedit.net])
PACKAGE_SHORT_VERSION=2.0
AC_SUBST(PACKAGE_SHORT_VERSION)
diff --git a/macos/Poedit-Info.plist b/macos/Poedit-Info.plist
index a7704e9d7b..d3c872b995 100644
--- a/macos/Poedit-Info.plist
+++ b/macos/Poedit-Info.plist
@@ -125,7 +125,7 @@
SUEnableAutomaticChecks
SUFeedURL
- https://poedit.net/updates/osx/appcast
+ https://poedit.net/updates_v2/osx/appcast
SUPublicDSAKeyFile
dsa_pub.pem
UTExportedTypeDeclarations
diff --git a/src/edapp.cpp b/src/edapp.cpp
index 90edf4f9ca..ccdee7c633 100644
--- a/src/edapp.cpp
+++ b/src/edapp.cpp
@@ -463,11 +463,11 @@ bool PoeditApp::OnInit()
#endif // USE_SPARKLE
#ifdef __WXMSW__
- wxString appcast = "https://poedit.net/updates/win/appcast";
+ wxString appcast = "https://poedit.net/updates_v2/win/appcast";
if ( CheckForBetaUpdates() )
{
// Beta versions use unstable feed.
- appcast = "https://poedit.net/updates/win/appcast/beta";
+ appcast = "https://poedit.net/updates_v2/win/appcast/beta";
}
win_sparkle_set_appcast_url(appcast.utf8_str());
diff --git a/src/version.h b/src/version.h
index 62da0bf972..f4de338510 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
-#define POEDIT_VERSION "2.0beta2"
+#define POEDIT_VERSION "2.0"
#define POEDIT_VERSION_SHORT "2.0"
#define POEDIT_VERSION_WIN 2,0,0
diff --git a/win32/poedit.iss b/win32/poedit.iss
index 7f0d3d1cfd..44d0e0eb08 100644
--- a/win32/poedit.iss
+++ b/win32/poedit.iss
@@ -31,7 +31,7 @@
#include "../" + CONFIG + "/git_build_number.h"
#define VERSION "2.0"
-#define VERSION_FULL "2.0beta2"
+#define VERSION_FULL "2.0"
#define VERSION_WIN VERSION + "." + Str(POEDIT_GIT_BUILD_NUMBER)
#ifndef CRT_REDIST