[Debian-l10n-commits] poedit branch master updated. debian/1.8.10-2-3-g2a33061
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Oct 22 23:05:19 UTC 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".
The branch, master has been updated
via 2a330617fa20831cf7e5dcafb9bab34dbb16750b (commit)
via 84cf0fa6ec1126c774ee028e3219ae571250866a (commit)
via e00f01c36a5b92d63148e1fd7e3f498136927412 (commit)
from 000f33f3a768c377b8934ecce462ce154f44f052 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=2a330617fa20831cf7e5dcafb9bab34dbb16750b
commit 2a330617fa20831cf7e5dcafb9bab34dbb16750b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sun Oct 23 01:04:52 2016 +0200
Upload to unstable
http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=84cf0fa6ec1126c774ee028e3219ae571250866a
commit 84cf0fa6ec1126c774ee028e3219ae571250866a
Merge: 000f33f e00f01c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sun Oct 23 01:03:37 2016 +0200
Merge tag 'upstream/1.8.11'
Upstream version 1.8.11
-----------------------------------------------------------------------
Summary of changes:
NEWS | 7 +++++++
configure | 22 +++++++++++-----------
configure.ac | 4 ++--
debian/changelog | 6 ++++++
docs/poedit.1 | 4 ++--
src/edapp.cpp | 3 ++-
src/language.cpp | 8 +++++++-
src/text_control.cpp | 2 ++
src/version.h | 4 ++--
9 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/NEWS b/NEWS
index fc790c8..373ec7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
+Version 1.8.11
+--------------
+
+- [macOS] Fixed opening files by double-clicking them in Finder.
+- Fixed handling of sr_RS locale.
+
+
Version 1.8.10
--------------
diff --git a/configure b/configure
index 179024a..1862ad9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poedit 1.8.10.
+# Generated by GNU Autoconf 2.69 for poedit 1.8.11.
#
# Report bugs to <help at poedit.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poedit'
PACKAGE_TARNAME='poedit'
-PACKAGE_VERSION='1.8.10'
-PACKAGE_STRING='poedit 1.8.10'
+PACKAGE_VERSION='1.8.11'
+PACKAGE_STRING='poedit 1.8.11'
PACKAGE_BUGREPORT='help at poedit.net'
PACKAGE_URL=''
@@ -1361,7 +1361,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poedit 1.8.10 to adapt to many kinds of systems.
+\`configure' configures poedit 1.8.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1431,7 +1431,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poedit 1.8.10:";;
+ short | recursive ) echo "Configuration of poedit 1.8.11:";;
esac
cat <<\_ACEOF
@@ -1588,7 +1588,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poedit configure 1.8.10
+poedit configure 1.8.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1995,7 +1995,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poedit $as_me 1.8.10, which was
+It was created by poedit $as_me 1.8.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2343,7 +2343,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-PACKAGE_SHORT_VERSION=1.8.10
+PACKAGE_SHORT_VERSION=1.8.11
ac_aux_dir=
@@ -2935,7 +2935,7 @@ fi
# Define the identity of the package.
PACKAGE='poedit'
- VERSION='1.8.10'
+ VERSION='1.8.11'
cat >>confdefs.h <<_ACEOF
@@ -8747,7 +8747,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poedit $as_me 1.8.10, which was
+This file was extended by poedit $as_me 1.8.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8804,7 +8804,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poedit config.status 1.8.10
+poedit config.status 1.8.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 53d0adb..e6d5867 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.10], [help at poedit.net])
-PACKAGE_SHORT_VERSION=1.8.10
+AC_INIT([poedit], [1.8.11], [help at poedit.net])
+PACKAGE_SHORT_VERSION=1.8.11
AC_SUBST(PACKAGE_SHORT_VERSION)
AC_CONFIG_AUX_DIR([admin])
diff --git a/debian/changelog b/debian/changelog
index 84a7d4a..6be6dd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+poedit (1.8.11-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Sun, 23 Oct 2016 01:04:27 +0200
+
poedit (1.8.10-2) unstable; urgency=medium
* Add appdata profile
diff --git a/docs/poedit.1 b/docs/poedit.1
index dc554fb..0132105 100644
--- a/docs/poedit.1
+++ b/docs/poedit.1
@@ -2,12 +2,12 @@
.\" Title: poedit
.\" Author: Vaclav Slavik <vaclav at slavik.io>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 10/14/2016
+.\" Date: 10/20/2016
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "POEDIT" "1" "10/14/2016" "\ \&" "\ \&"
+.TH "POEDIT" "1" "10/20/2016" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/src/edapp.cpp b/src/edapp.cpp
index b9da7e8..9f4acda 100644
--- a/src/edapp.cpp
+++ b/src/edapp.cpp
@@ -879,7 +879,8 @@ bool PoeditApp::OnCmdLineParsed(wxCmdLineParser& parser)
wxArrayString filesToOpen;
for (size_t i = 0; i < parser.GetParamCount(); i++)
filesToOpen.Add(parser.GetParam(i));
- OSXStoreOpenFiles(filesToOpen);
+ if (!filesToOpen.empty())
+ OSXStoreOpenFiles(filesToOpen);
#else
for (size_t i = 0; i < parser.GetParamCount(); i++)
gs_filesToOpen.Add(parser.GetParam(i));
diff --git a/src/language.cpp b/src/language.cpp
index 74e96c6..fda3fe2 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -175,9 +175,15 @@ const DisplayNamesData& GetDisplayNamesData()
if (*script != '\0')
{
if (strcmp(script, "Latn") == 0)
+ {
code += "@latin";
+ }
else if (strcmp(script, "Cyrl") == 0)
- code += "@cyrillic";
+ {
+ // add @cyrillic only if it's not the default already
+ if (strcmp(language, "sr") != 0)
+ code += "@cyrillic";
+ }
}
s.foldCase();
diff --git a/src/text_control.cpp b/src/text_control.cpp
index 707d29f..6b96dd7 100644
--- a/src/text_control.cpp
+++ b/src/text_control.cpp
@@ -513,6 +513,8 @@ void AnyTranslatableTextCtrl::SetLanguage(const Language& lang)
{
m_language = lang;
+ wxEventBlocker block(this, wxEVT_TEXT);
+
#ifdef __WXOSX__
NSTextView *text = TextView(this);
if (lang.IsRTL())
diff --git a/src/version.h b/src/version.h
index e386823..cfec0f2 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
-#define POEDIT_VERSION "1.8.10"
-#define POEDIT_VERSION_WIN 1,8,10
+#define POEDIT_VERSION "1.8.11"
+#define POEDIT_VERSION_WIN 1,8,11
#endif // _VERSION_H_
-----------------------------------------------------------------------
hooks/post-receive
--
poedit
More information about the Debian-l10n-commits
mailing list