Commit c9887f62 authored by Nick Schermer's avatar Nick Schermer

Updates for release.

parent 98684e87
4.8.0
=====
- Dispatch primary clipboard restoration (bug #6819).
- Use preferences-desktop as settings manager icon (bug #7080).
- Remove old shortuts from store when editing the key combo.
- Updated translations: Romanian, French, Croatian, Polish, Greek.
4.7.7
=====
- Remove duplicated terminal entry in xfce4-settings-helper autostart
......
......@@ -10,11 +10,11 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
m4_define([xfce4_settings_version_major], [4])
m4_define([xfce4_settings_version_minor], [7])
m4_define([xfce4_settings_version_micro], [7])
m4_define([xfce4_settings_version_minor], [8])
m4_define([xfce4_settings_version_micro], [0])
m4_define([xfce4_settings_version_nano], [])
m4_define([xfce4_settings_version_build], [@REVISION@])
m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
dnl *******************************************
......@@ -25,7 +25,7 @@ m4_define([xfce4_settings_debug_default], [ifelse(xfce4_settings_version_tag(),
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
AC_COPYRIGHT([Copyright (c) 2008-2010
AC_COPYRIGHT([Copyright (c) 2008-2011
The Xfce development team. All rights reserved.])
AC_INIT([xfce4-settings], [xfce4_settings_version], [http://bugzilla.xfce.org/])
AC_PREREQ([2.50])
......@@ -73,13 +73,13 @@ XDT_I18N([@LINGUAS@])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.4])
XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-2], [4.7.4])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-2], [4.8.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
XDT_CHECK_PACKAGE([XI], [xi], [1.2.0], [],
......
......@@ -158,7 +158,7 @@ main (gint argc, gchar **argv)
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008-2010");
g_print ("%s\n", "Copyright (c) 2008-2011");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
......
......@@ -842,7 +842,7 @@ main(gint argc, gchar **argv)
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008-2010");
g_print ("%s\n", "Copyright (c) 2008-2011");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
......
......@@ -1061,7 +1061,7 @@ main (gint argc, gchar **argv)
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2004-2010");
g_print ("%s\n", "Copyright (c) 2004-2011");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
......
......@@ -76,7 +76,7 @@ main (int argc,
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008-2010");
g_print ("%s\n", "Copyright (c) 2008-2011");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
......
......@@ -1203,7 +1203,7 @@ main (gint argc, gchar **argv)
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2004-2010");
g_print ("%s\n", "Copyright (c) 2004-2011");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-settings 4.7.7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-05 05:10+0000\n"
"POT-Creation-Date: 2011-01-16 17:16+0100\n"
"PO-Revision-Date: 2011-01-05 11:53+0100\n"
"Last-Translator: Piotr Sokół <psokol@jabster.pl>\n"
"Language-Team: Polish <>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n"
"%100<10 || n%100>=20)) ? 1 : 2));\n"
......@@ -847,26 +847,26 @@ msgstr "Układ"
msgid "Variant"
msgstr "Wariant"
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:851
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:852
msgid "Shortcut command may not be empty."
msgstr "Polecenie skrótu nie może być puste."
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:959
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:960
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:961
msgid "Reset to Defaults"
msgstr "Przywracanie wartości domyślnych"
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:961
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:962
msgid ""
"This will reset all shortcuts to their default values. Do you really want to "
"do this?"
msgstr "Przywrócić wartości domyślne wszystkich skrótów klawiszowych?"
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1026
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1027
msgid "The system defaults will be restored next time you log in."
msgstr "Ustawienia systemowe zostaną przywrócone po następnym zalogowaniu."
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1028
#: ../dialogs/keyboard-settings/xfce-keyboard-settings.c:1029
msgid "Warning"
msgstr "Ostrzeżenie"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -78,7 +78,7 @@ main(gint argc, gchar **argv)
if (G_UNLIKELY (opt_version))
{
g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008-2010");
g_print ("%s\n", "Copyright (c) 2008-2011");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print ("\n");
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment