Updating branch refs/heads/master
         to 4a124e63a175eef5d48dc617ba18826c4e9ef41f (commit)
       from fb022e695968f50e5d15e743b2e54f888c9c4508 (commit)

commit 4a124e63a175eef5d48dc617ba18826c4e9ef41f
Author: Nick Schermer <[email protected]>
Date:   Thu Jan 9 20:56:56 2014 +0100

    Updates for release.

 Makefile.am     |    1 -
 NEWS            |   32 ++++++++++++++++++++++++++++++++
 configure.ac.in |   17 +++--------------
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d24d776..c225c3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS = src po
 
 EXTRA_DIST =                                   \
        autogen.sh                                      \
-       README.I18N                                     \
        gigolo.desktop.in                       \
        intltool-extract.in                     \
        intltool-merge.in                       \
diff --git a/NEWS b/NEWS
index 3ccf6e5..911fe3c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,35 @@
+Gigolo 0.4.2 (January 9, 2014)
+
+       * Fix mnemonics in the Connect dialog.
+       * Resolve symbolic links before writing config files.
+       * Remember side panel position.
+       * Store and display colours for bookmarks.
+       * Allow editing bookmarks from the main window popup menu.
+       * Do not set the colour when no colour is explicitly selected.
+       * Add a separator to the Bookmark Edit Dialog.
+       * Don't show errors we are not supposed to show.
+       * Automatically choose the first Samba share if any were found.
+       * Add 'Open in Terminal' command.
+       * Remove some set but unused variables.
+       * Display bookmark name in the connection list if the connection
+         has a bookmark.
+       * Do not make the Connect button insensitive, never (bug #8103).
+       * Improve WebDav URI handling.
+       * Validate an entered custom URI by trying to parse it.
+       * After creating/editing a bookmark, update the list of mounts.
+       * Fix WebDav path parsing when there is no path.
+       * Add new command-line option to auto connect bookmarks.
+       * Drop Waf build system support and just use autotools.
+       * Translation updates: Arabic, Asturian, Bulgarian, Catalan
+         (Valencian), Czech, Danish, German, Greek, English (Australia),
+         Esperanto, Spanish (Castilian), Basque, Finnish, French, Galician,
+         Hebrew, Croatian, Hungarian, Indonesian, Icelandic, Italian,
+         Japanese, Kazakh, Korean, Lithuanian, Latvian, Dutch (Flemish),
+         Occitan (post 1500), Polish, Portuguese, Portuguese (Brazilian),
+         Russian, Slovak, Slovenian, Serbian, Swedish, Telugu, Turkish,
+         Uyghur, Ukrainian, Urdu, Urdu (Pakistan), Chinese (China), Chinese
+         (Taiwan).
+
 Gigolo 0.4.1 (July 31, 2010)
 
        * Use SSH/SFTP as default connection type for new bookmarks/connections
diff --git a/configure.ac.in b/configure.ac.in
index eecbbc0..16fd5f7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([gigolo], [0.4.1], [http://bugs.xfce.org/])
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AC_INIT([gigolo], [0.4.2], [http://bugs.xfce.org/])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -32,18 +32,7 @@ AC_ARG_ENABLE(deprecated, [  --disable-deprecated    Disable 
deprecated GTK func
 GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
 
 # i18n
-GETTEXT_PACKAGE=gigolo
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package.])
-
-if test "${LINGUAS}"; then
-       ALL_LINGUAS="${LINGUAS}"
-else
-       if test -z "$conf_dir" ; then
-               conf_dir="."
-       fi
-       ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | 
$AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
-fi
+XDT_I18N([@LINGUAS@])
 
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits

Reply via email to