[Xfce4-commits] Update to 2013 xfce standards
Updating branch refs/heads/master
to e55a418bd9d8c284774d7b8ac33aff0356a5a4ab (commit)
from cd1bb412779e6240eeffecc717528c8053f0fe1d (commit)
commit e55a418bd9d8c284774d7b8ac33aff0356a5a4ab
Author: Landry Breuil
Date: Wed Feb 13 22:49:21 2013 +0100
Update to 2013 xfce standards
- rename datetime.desktop.in.in
- use newer xfce4/panel/plugins paths for desktop and module file
- register the module as not internal to the panel
- remove now useless cygwin check
configure.ac.in|1 -
panel-plugin/Makefile.am | 27 ++-
panel-plugin/datetime.c|2 +-
...{datetime.desktop.in.in => datetime.desktop.in} |2 +-
po/POTFILES.in |2 +-
5 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 98b394a..cdb3536 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -17,7 +17,6 @@ AM_MAINTAINER_MODE()
dnl Check for UNIX variants
AC_AIX
AC_ISC_POSIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])
dnl check for basic programs
AC_PROG_CC
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 18bbc7e..c6e44df 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/xfce4/panel-plugins/
+plugindir = $(libdir)/xfce4/panel/plugins/
plugin_LTLIBRARIES = \
libdatetime.la
@@ -19,12 +19,10 @@ libdatetime_la_CFLAGS = \
libdatetime_la_LDFLAGS = \
-avoid-version \
- -module
-
-if HAVE_CYGWIN
-libdatetime_la_LDFLAGS += \
- -no-undefined
-endif
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
libdatetime_la_LIBADD =\
$(GTK_LIBS) \
@@ -32,19 +30,12 @@ libdatetime_la_LIBADD = \
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4UTIL_LIBS)
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = datetime.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
- sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_in_files = datetime.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- $(desktop_in_in_files)
-
-DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+EXTRA_DIST = $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 0738889..3350c3a 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -694,5 +694,5 @@ static void datetime_construct(XfcePanelPlugin *plugin)
}
-XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(datetime_construct);
+XFCE_PANEL_PLUGIN_REGISTER(datetime_construct);
diff --git a/panel-plugin/datetime.desktop.in.in
b/panel-plugin/datetime.desktop.in
similarity index 75%
rename from panel-plugin/datetime.desktop.in.in
rename to panel-plugin/datetime.desktop.in
index e3e3c5d..3c3277a 100644
--- a/panel-plugin/datetime.desktop.in.in
+++ b/panel-plugin/datetime.desktop.in
@@ -4,4 +4,4 @@ _Name=DateTime
_Comment=Date and Time plugin with a simple calendar
Icon=xfce-schedule
X-XFCE-Module=datetime
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Internal=FALSE
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ec27071..971c3a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
panel-plugin/datetime.c
panel-plugin/datetime-dialog.c
-panel-plugin/datetime.desktop.in.in
+panel-plugin/datetime.desktop.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove Xfce 4.6 compat files, we now depend on 4.8.
Updating branch refs/heads/master
to cd1bb412779e6240eeffecc717528c8053f0fe1d (commit)
from 25c3c81a01a899577702b9cabdb60a3b7da7483a (commit)
commit cd1bb412779e6240eeffecc717528c8053f0fe1d
Author: Landry Breuil
Date: Wed Feb 13 22:35:04 2013 +0100
Remove Xfce 4.6 compat files, we now depend on 4.8.
panel-plugin/Makefile.am |4 +-
panel-plugin/datetime.c |2 -
panel-plugin/xfce46-compat.c | 193 --
panel-plugin/xfce46-compat.h | 20 -
4 files changed, 1 insertions(+), 218 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 6f0bb00..18bbc7e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -7,9 +7,7 @@ libdatetime_la_SOURCES =\
datetime.h \
datetime.c \
datetime-dialog.h \
- datetime-dialog.c \
- xfce46-compat.h \
- xfce46-compat.c
+ datetime-dialog.c
libdatetime_la_CFLAGS =\
-I$(top_srcdir) \
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 031166a..0738889 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -33,8 +33,6 @@
#include
#include
-#include "xfce46-compat.h"
-
#include "datetime.h"
#include "datetime-dialog.h"
diff --git a/panel-plugin/xfce46-compat.c b/panel-plugin/xfce46-compat.c
deleted file mode 100644
index 97f10b1..000
--- a/panel-plugin/xfce46-compat.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Code was taken from libxfce4panel (LGPL2 or any later version),
- * distributed here under the GPL.
- *
- * Copyright (c) 2005-2007 Jasper Huijsmans
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include
-#endif
-
-#ifndef HAVE_LIBXFCE4PANEL_46
-
-#include "xfce46-compat.h"
-
-#include
-#include
-
-/* support macros for debugging */
-#ifndef NDEBUG
-#define _panel_assert(expr) g_assert (expr)
-#define _panel_assert_not_reached() g_assert_not_reached ()
-#define _panel_return_if_fail(expr) g_return_if_fail (expr)
-#define _panel_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
-#else
-#define _panel_assert(expr) G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
-#endif
-
-/**
- * xfce_panel_plugin_arrow_type:
- * @plugin: an #XfcePanelPlugin
- *
- * Determine the #GtkArrowType for a widget that opens a menu and uses
- * xfce_panel_plugin_position_menu() to position the menu.
- *
- * Returns: The #GtkArrowType to use.
- **/
-GtkArrowType
-xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
-{
-XfceScreenPosition position;
-GdkScreen *screen;
-GdkRectanglegeom;
-gintmon, x, y;
-
-if (!GTK_WIDGET_REALIZED (plugin))
-return GTK_ARROW_UP;
-
-position = xfce_panel_plugin_get_screen_position (plugin);
-switch (position)
-{
-/* top */
-case XFCE_SCREEN_POSITION_NW_H:
-case XFCE_SCREEN_POSITION_N:
-case XFCE_SCREEN_POSITION_NE_H:
-return GTK_ARROW_DOWN;
-
-/* left */
-case XFCE_SCREEN_POSITION_NW_V:
-case XFCE_SCREEN_POSITION_W:
-case XFCE_SCREEN_POSITION_SW_V:
-return GTK_ARROW_RIGHT;
-
-/* right */
-case XFCE_SCREEN_POSITION_NE_V:
-case XFCE_SCREEN_POSITION_E:
-case XFCE_SCREEN_POSITION_SE_V:
-return GTK_ARROW_LEFT;
-
-/* bottom */
-case XFCE_SCREEN_POSITION_SW_H:
-case XFCE_SCREEN_POSITION_S:
-case XFCE_SCREEN_POSITION_SE_H:
-return GTK_ARROW_UP;
-
-/* floating */
-default:
-/* get the screen information */
-screen = gtk_widget_get_screen (GTK_WIDGET (plugin));
-mon = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET
(plugin)->window);
[Xfce4-commits] remove useless pot file
Updating branch refs/heads/master to 25c3c81a01a899577702b9cabdb60a3b7da7483a (commit) from 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f (commit) commit 25c3c81a01a899577702b9cabdb60a3b7da7483a Author: Landry Breuil Date: Wed Feb 13 22:33:07 2013 +0100 remove useless pot file po/xfce4-datetime-plugin.pot | 108 -- 1 files changed, 0 insertions(+), 108 deletions(-) diff --git a/po/xfce4-datetime-plugin.pot b/po/xfce4-datetime-plugin.pot deleted file mode 100644 index 72a099b..000 --- a/po/xfce4-datetime-plugin.pot +++ /dev/null @@ -1,108 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-31 13:39-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../panel-plugin/datetime.c:82 -msgid "Invalid format" -msgstr "" - -#: ../panel-plugin/datetime.c:87 -msgid "Error" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:42 -msgid "Date, then time" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:43 -msgid "Time, then date" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:44 -msgid "Date only" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:45 -msgid "Time only" -msgstr "" - -#. placeholder -#: ../panel-plugin/datetime-dialog.c:85 ../panel-plugin/datetime-dialog.c:96 -msgid "Custom..." -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:131 -msgid "Select font" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:332 -#, c-format -msgid "Unable to open the following url: %s" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:371 -msgid "Datetime" -msgstr "" - -#. -#. * layout frame -#. -#: ../panel-plugin/datetime-dialog.c:391 -msgid "Layout" -msgstr "" - -#. Format label -#. format label -#: ../panel-plugin/datetime-dialog.c:405 ../panel-plugin/datetime-dialog.c:467 -#: ../panel-plugin/datetime-dialog.c:570 -msgid "Format:" -msgstr "" - -#. -#. * Date frame -#. -#: ../panel-plugin/datetime-dialog.c:425 -msgid "Date" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:437 -msgid "The date will appear in a tooltip." -msgstr "" - -#. font label -#: ../panel-plugin/datetime-dialog.c:450 ../panel-plugin/datetime-dialog.c:553 -msgid "Font:" -msgstr "" - -#. -#. * time frame -#. -#: ../panel-plugin/datetime-dialog.c:528 -msgid "Time" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:540 -msgid "The time will appear in a tooltip." -msgstr "" - -#: ../panel-plugin/datetime.desktop.in.in.h:1 -msgid "Date and Time plugin with a simple calendar" -msgstr "" - -#: ../panel-plugin/datetime.desktop.in.in.h:2 -msgid "DateTime" -msgstr "" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Port to libxfce4ui. (bug #8064)
Updating branch refs/heads/master to 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f (commit) from 7d11392ef6d626519e5c6ef317b681df61637ca6 (commit) commit 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f Author: Landry Breuil Date: Wed Feb 13 22:30:03 2013 +0100 Port to libxfce4ui. (bug #8064) Joachim Wiedorn sent a very similar patch, thanks too! INSTALL| 53 +++ configure.ac.in| 29 ++--- panel-plugin/Makefile.am |4 +- panel-plugin/datetime-dialog.c |8 +++--- panel-plugin/datetime.c|2 +- 5 files changed, 47 insertions(+), 49 deletions(-) diff --git a/INSTALL b/INSTALL index d3c5b40..23e5f25 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions * -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,10 +10,7 @@ unlimited permission to copy, distribute and modify it. Basic Installation == -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -26,9 +23,9 @@ debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is +the results of its tests to speed up reconfiguring. (Caching is disabled by default to prevent problems with accidental use of stale -cache files. +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -38,17 +35,20 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,9 +67,6 @@ The simplest way to compile this package is: all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. - Compilers and Options = @@ -81,7 +78,7 @@ details on some of the pertinent environment variables. by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c99 CFLAGS=-g LIBS=-lposix + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix *Note Defining Variables::, for more details. @@ -90,15 +87,17 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfi
[Xfce4-commits] Update Easylist subscription url for Adblock
Updating branch refs/heads/master to 25f94c69f1b12748a510cf311bf6134830964229 (commit) from 299e85bbade91d2d7637de75924ab99b24c2a0c4 (commit) commit 25f94c69f1b12748a510cf311bf6134830964229 Author: Paweł Forysiuk Date: Wed Feb 13 13:24:59 2013 +0100 Update Easylist subscription url for Adblock data/extensions/adblock/config |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/extensions/adblock/config b/data/extensions/adblock/config index 395a104..4f73557 100644 --- a/data/extensions/adblock/config +++ b/data/extensions/adblock/config @@ -1,2 +1,2 @@ [settings] -filters=http://adblockplus.mozdev.org/easylist/easylist.txt;https://easylist-downloads.adblockplus.org/easyprivacy.txt +filters=https://easylist-downloads.adblockplus.org/easylist.txt;https://easylist-downloads.adblockplus.org/easyprivacy.txt ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] 4.9.6.0 Fixed bug 9024 Removing Elements Does Not Reduce Window Size
Updating branch refs/heads/master
to 7edbd569e0fcbdb69ed3ea12ef57971b25a60237 (commit)
from bd4d460ed7ecf50362696ac9b723ad880a1d52cd (commit)
commit 7edbd569e0fcbdb69ed3ea12ef57971b25a60237
Author: Juha
Date: Wed Feb 13 14:54:02 2013 +0200
4.9.6.0 Fixed bug 9024 Removing Elements Does Not Reduce Window Size
Fixed parameters so that that removing both event and todo box also
causes the space they take to vanish.
Also fixed a bug where adding todo box after start did not actually
add it.
Also added code to save main calendar window size and location always
when ending Orage (unless killed).
Also changed parameter order a little to be more consistent.
configure.in.in |2 +-
src/main.c |3 +-
src/mainbox.c| 13
src/mainbox.h|1 +
src/parameters.c | 87 -
src/tray_icon.c |6 ++--
6 files changed, 66 insertions(+), 46 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 95683c4..459d305 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto
dnl
dnl Version information
-m4_define([orage_version], [4.9.5.0-git])
+m4_define([orage_version], [4.9.6.0-git])
m4_define([gtk_minimum_version], [2.14.0])
m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/main.c b/src/main.c
index d2e87ad..1c17d5a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
/* Orage - Calendar and alarm handler
*
- * Copyright (c) 2005-2011 Juha Kautto (juha at xfce.org)
+ * Copyright (c) 2005-2013 Juha Kautto (juha at xfce.org)
* Copyright (c) 2003-2006 Mickael Graf (korbinus at xfce.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -234,6 +234,7 @@ static gboolean keep_tidy(void)
calendar file smaller and faster */
xfical_archive();
#endif
+write_parameters();
return(TRUE);
}
diff --git a/src/mainbox.c b/src/mainbox.c
index ca82d5b..c63ec68 100644
--- a/src/mainbox.c
+++ b/src/mainbox.c
@@ -792,6 +792,19 @@ void build_mainbox_event_box(void)
xfical_file_close(TRUE);
}
+void build_mainbox_todo_box(void)
+{
+#undef P_N
+#define P_N "build_mainbox_todo_box: "
+#ifdef ORAGE_DEBUG
+orage_message(-100, P_N);
+#endif
+if (!xfical_file_open(TRUE))
+return;
+build_mainbox_todo_info();
+xfical_file_close(TRUE);
+}
+
/**
* This routine is called from ical-code xfical_alarm_build_list_internal
* and ical files are already open at that time. So make sure ical files
diff --git a/src/mainbox.h b/src/mainbox.h
index 56fbbbe..e69fbed 100644
--- a/src/mainbox.h
+++ b/src/mainbox.h
@@ -66,6 +66,7 @@ void build_mainWin();
gboolean orage_mark_appointments();
void build_mainbox_info();
void build_mainbox_event_box();
+void build_mainbox_todo_box();
void mCalendar_month_changed_cb(GtkCalendar *calendar, gpointer user_data);
#endif /* !__MAINBOX_H__ */
diff --git a/src/parameters.c b/src/parameters.c
index a4e5cc6..6c30ffd 100644
--- a/src/parameters.c
+++ b/src/parameters.c
@@ -193,21 +193,21 @@ static void weeks_changed(GtkWidget *dialog, gpointer
user_data)
set_calendar();
}
-static void set_todos(void)
-{
-if (g_par.show_todos)
-gtk_widget_show_all(((CalWin *)g_par.xfcal)->mTodo_vbox);
-else
-gtk_widget_hide_all(((CalWin *)g_par.xfcal)->mTodo_vbox);
-}
-
static void todos_changed(GtkWidget *dialog, gpointer user_data)
{
Itf *itf = (Itf *)user_data;
g_par.show_todos = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
itf->show_todos_checkbutton));
-set_todos();
+if (g_par.show_todos)
+build_mainbox_todo_box();
+else {
+gtk_widget_hide_all(((CalWin *)g_par.xfcal)->mTodo_vbox);
+/* hide the whole area if also event box does not exist */
+if (!g_par.show_event_days)
+gtk_window_resize(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow)
+, g_par.size_x, 1);
+}
}
static void show_events_spin_changed(GtkSpinButton *sb, gpointer user_data)
@@ -215,8 +215,13 @@ static void show_events_spin_changed(GtkSpinButton *sb,
gpointer user_data)
g_par.show_event_days = gtk_spin_button_get_value(sb);
if (g_par.show_event_days)
build_mainbox_event_box();
-else
+else {
gtk_widget_hide_all(((CalWin *)g_par.xfcal)->mEvent_vbox);
+/* hide the whole area if also todo box does not exist */
+if (!g_par.show_todos)
+gtk_window_resize(GTK_WINDOW(((CalWin *)g_par.xfcal)->mWindow)
+, g_par.size_x, 1);
+}
}
static void set_stick(void)
@@ -616,6 +621,37 @@ static void create_parameter_dialog_calendar_setup_tab(Itf
*dialog)
g_signal_connect(G_OBJECT(dialog->show_weeks_checkbutton), "toggled"
, G_CALLBACK(weeks_changed), dialog);
+
[Xfce4-commits] l10n: Updates to Bulgarian translation
Updating branch refs/heads/master
to 64aaa15594f67f65abc224ddbd3223668da1de26 (commit)
from aeef053b3c8fa2095342f98f83a989682ea19e3b (commit)
commit 64aaa15594f67f65abc224ddbd3223668da1de26
Author: Kiril Kirilov
Date: Wed Feb 13 10:49:32 2013 +0100
l10n: Updates to Bulgarian translation
New status: 18 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{pt.po => bg.po} | 46 +++---
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/po/pt.po b/po/bg.po
similarity index 55%
copy from po/pt.po
copy to po/bg.po
index 231dcfa..e994641 100644
--- a/po/pt.po
+++ b/po/bg.po
@@ -1,24 +1,24 @@
-# Portuguese translations for xfvnc package.
-# Copyright (C) 2007 THE Xfvnc'S COPYRIGHT HOLDER
+# Bulgarian translations for xfvnc package.
+# Copyright (C) 2008 THE Xfvnc'S COPYRIGHT HOLDER
# This file is distributed under the same license as the xfvnc package.
-# Nuno Miguel 2009.
+# Kiril Kirilov (Cybercop) , 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: xfvnc\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-11-02 01:40-0700\n"
-"PO-Revision-Date: 2012-01-12 13:10-\n"
-"Last-Translator: Sérgio Marques \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2013-02-13 11:48+0200\n"
+"Last-Translator: Kiril Kirilov (Cybercop) \n"
+"Language-Team: Bulgarian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language: bg\n"
#: ../xfvnc/main.c:28
msgid "Connected. Starting session..."
-msgstr "Ligado. A iniciar sessão..."
+msgstr "Успешно свързване. Стартиране на сесия..."
#: ../xfvnc/main.c:50
#, c-format
@@ -27,19 +27,19 @@ msgstr "XfVNC .:. %s"
#: ../xfvnc/main.c:64
msgid "Connection Error"
-msgstr "Erro de ligação"
+msgstr "Неуспешно свързване"
#: ../xfvnc/main.c:66
msgid "There was an error connecting to the VNC server"
-msgstr "Ocorreu um erro ao ligar ao servidor VNC"
+msgstr "Възникна грешка при свързване с VNC сървъра"
#: ../xfvnc/main.c:67
msgid "Unfortunately, the type of error is unknown."
-msgstr "Infelizmente, o tipo de erro é desconhecido."
+msgstr "Неизвестен тип грешка."
#: ../xfvnc/xfvnc.desktop.in.h:1
msgid "VNC Viewer"
-msgstr "Visualizador VNC"
+msgstr "VNC клиент"
#: ../xfvnc/xfvnc.desktop.in.h:2
#: ../xfvnc/xfvnc.glade.h:4
@@ -48,45 +48,45 @@ msgstr "XfVNC"
#: ../xfvnc/xfvnc.desktop.in.h:3
msgid "Xfce VNC Viewer Application"
-msgstr "Aplicação de VNC para o Xfce"
+msgstr "VNC клиентско приложение за Xfce"
#: ../xfvnc/xfvnc.glade.h:1
msgid "Connecting..."
-msgstr "A ligar..."
+msgstr "Свързване..."
#: ../xfvnc/xfvnc.glade.h:2
msgid "Display _number:"
-msgstr "Exibir _número:"
+msgstr "Номер на екрана:"
#: ../xfvnc/xfvnc.glade.h:3
msgid "Show _fullscreen"
-msgstr "_Mostrar ecrã completo"
+msgstr "Показване на цял екран"
#: ../xfvnc/xfvnc.glade.h:5
msgid "XfVNC Status"
-msgstr "Estado do XfVNC"
+msgstr "Статус на XfVNC"
#: ../xfvnc/xfvnc.glade.h:6
msgid "Xfce VNC Viewer"
-msgstr "Visualizador VNC do Xfce"
+msgstr "VNC клиент за Xfce"
#: ../xfvnc/xfvnc.glade.h:7
msgid "_Allow other clients to connect"
-msgstr "Permitir ligação _a outros clientes"
+msgstr "Разрешавай на други клиенти да се свързват"
#: ../xfvnc/xfvnc.glade.h:8
msgid "_Computer name:"
-msgstr "Nome do _computador:"
+msgstr "Име на компютъра:"
#: ../xfvnc/xfvnc.glade.h:9
msgid "_Password:"
-msgstr "_Senha:"
+msgstr "Парола:"
#: ../xfvnc/xfvnc.glade.h:10
msgid "_Recent servers:"
-msgstr "Servidores _recentes:"
+msgstr "Последно използвани сървъри:"
#: ../xfvnc/xfvnc.glade.h:11
msgid "_View only"
-msgstr "_Ver apenas"
+msgstr "Само преглед"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updates to Bulgarian translation
Updating branch refs/heads/master
to a048ad79cc99cefc9686bce97d8b4c4ed7376993 (commit)
from db70fe74da6afca873864903073cba000f9e7078 (commit)
commit a048ad79cc99cefc9686bce97d8b4c4ed7376993
Author: Kiril Kirilov
Date: Wed Feb 13 10:31:44 2013 +0100
l10n: Updates to Bulgarian translation
New status: 70 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{fr.po => bg.po} | 160 +--
1 files changed, 78 insertions(+), 82 deletions(-)
diff --git a/po/fr.po b/po/bg.po
similarity index 58%
copy from po/fr.po
copy to po/bg.po
index 217660a..1626c00 100644
--- a/po/fr.po
+++ b/po/bg.po
@@ -1,127 +1,126 @@
-# French translations for xfmpc package
-# Traductions françaises du paquet xfmpc.
+# Bulgarian translations for xfmpc package
+# Bulgarian messages for xfmpc.
# Copyright (C) 2008 THE xfmpc'S COPYRIGHT HOLDER
# This file is distributed under the same license as the xfmpc package.
-# Mike Massonnet , 2008-2009.
-# Douart Patrick 2010.
+# Kiril Kirilov (Cybercop) , 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: xfmpc\n"
+"Project-Id-Version: xfmpc 0.0.5svn-r\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-10-23 17:29+0200\n"
-"PO-Revision-Date: 2012-08-26 14:15+0100\n"
-"Last-Translator: \n"
-"Language-Team: French\n"
-"Language: \n"
+"PO-Revision-Date: 2013-02-13 11:30+0200\n"
+"Last-Translator: Kiril Kirilov (Cybercop) \n"
+"Language-Team: Bulgarian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/dbbrowser.c:1508
msgid "Replace"
-msgstr "_Remplacer"
+msgstr "Замяна"
#: ../src/dbbrowser.c:1524
#: ../src/playlist.c:1511
msgid "Browse"
-msgstr "_Parcourir"
+msgstr "Преглед"
#: ../src/extended-interface.c:495
msgid "Repeat"
-msgstr "Répéter"
+msgstr "Повторение"
#: ../src/extended-interface.c:505
msgid "Random"
-msgstr "Aléatoire"
+msgstr "Случаен ред"
#: ../src/extended-interface.c:515
msgid "Single Mode"
-msgstr "Monomode"
+msgstr "Еднократен режим"
#: ../src/extended-interface.c:525
msgid "Consume Mode"
-msgstr "Mode de consommation"
+msgstr "Потребителски режим"
#: ../src/extended-interface.c:548
msgid "_Shortcuts"
-msgstr "_Raccourcis"
+msgstr "Клавишна комбинация"
#: ../src/extended-interface.c:747
#: ../xfmpc.desktop.in.h:2
msgid "MPD client written in GTK+ for Xfce"
-msgstr "Client MPD écrit en GTK+ pour Xfce"
+msgstr "MPD-клиент (използващ GTK+) за Xfce"
#: ../src/extended-interface.c:749
msgid "translator-credits"
-msgstr "Mike Massonnet"
+msgstr "Kiril Kirilov (Cybercop) "
#: ../src/extended-interface.c:890
msgid "Clear Playlist"
-msgstr "Vider la liste de lecture"
+msgstr "Изчистване на списъка за изпълнение"
#: ../src/extended-interface.c:908
msgid "Refresh Database"
-msgstr "Rafraîchir la base de données"
+msgstr "Обновяване на базата с данни"
#: ../src/extended-interface.c:926
msgid "Context Menu"
-msgstr "Menu contextuel"
+msgstr "Контекстно меню"
#: ../src/extended-interface.c:969
msgid "Current Playlist"
-msgstr "Liste de lecture"
+msgstr "Текущ списък за изпълнение"
#: ../src/extended-interface.c:975
msgid "Browse database"
-msgstr "Base de données"
+msgstr "Преглед на базата с данни"
#: ../src/interface.c:467
#, c-format
msgid "by \"%s\" from \"%s\" (%s)"
-msgstr "par « %s » de « %s » (%s)"
+msgstr "от \"%s\" от албум \"%s\" (%s)"
#: ../src/interface.c:486
msgid "Stopped"
-msgstr "Stoppé"
+msgstr "Спряно"
#: ../src/interface.c:496
#: ../src/interface.c:916
msgid "Not connected"
-msgstr "Déconnecté"
+msgstr "Не е свързан"
#: ../src/main-window.c:641
#, c-format
msgid "%d songs, %d hours and %d minutes"
-msgstr "%d chansons, %d heures et %d minutes"
+msgstr "%d песни, %d часа и %d минути"
#: ../src/main-window.c:652
#, c-format
msgid "%d songs, %d minutes"
-msgstr "%d chansons, %d minutes"
+msgstr "%d песни, %d минути"
#: ../src/mpdclient.c:382
msgid "Failed to connect to MPD"
-msgstr "Impossible de se connecter à MPD"
+msgstr "Неуспех при свързване с MPD"
#: ../src/mpdclient.c:387
msgid "Connected to MPD"
-msgstr "Connecté à MPD"
+msgstr "Връзката с MPD е осъществена"
#: ../src/mpdclient.c:627
#: ../src/mpdclient.c:657
#: ../src/mpdclient.c:672
msgid "n/a"
-msgstr "n/a"
+msgstr "н/д"
#: ../src/preferences-dialog.c:701
msgid "Xfmpc Preferences"
-msgstr "Préférences de Xfmpc"
+msgstr "Настройки на Xfmpc"
#: ../src/preferences-dialog.c:703
msgid "Customize your MPD client"
-msgstr "Personnalisation du client MPD"
+msgstr "Оформление на MPD-клиента"
#: ../src/preferences-dialog.c:720
msgid "MPD"
@@ -129,192 +128,189 @@ msgstr "MPD"
#: ../src/preferences-dialog.c:731
msgid "Connection"
-msgstr "Connexion"
+msgstr "Връзка"
#: ../src/preferences-
