diff options
72 files changed, 465 insertions, 757 deletions
@@ -1,7 +1,7 @@ Changes in MATE-Applets 1.9.0 ============================= -... + - Use MateAboutDialog from libmate-desktop. Changes in MATE-Applets 1.8.0 ============================= diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am index 2ef0be12..37f8430f 100644 --- a/accessx-status/Makefile.am +++ b/accessx-status/Makefile.am @@ -38,7 +38,7 @@ org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = accessx-status-applet-menu.xml CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES) diff --git a/accessx-status/applet.c b/accessx-status/applet.c index e97acb0b..bdea685d 100644 --- a/accessx-status/applet.c +++ b/accessx-status/applet.c @@ -39,6 +39,7 @@ #include <X11/keysymdef.h> #include "applet.h" +#include <libmate-desktop/mate-aboutdialog.h> #if GTK_CHECK_VERSION (3, 0, 0) #define MATE_DESKTOP_USE_UNSTABLE_API #include <libmate-desktop/mate-desktop-utils.h> @@ -140,7 +141,7 @@ static void about_cb(GtkAction* action, AccessxStatusApplet* sapplet) NULL }; - gtk_show_about_dialog(NULL, + mate_show_about_dialog(NULL, "version", VERSION, "comments", _("Shows the state of AccessX features such as latched modifiers"), "copyright", "\xC2\xA9 2003 Sun Microsystems", diff --git a/battstat/Makefile.am b/battstat/Makefile.am index 4985f251..21ff989d 100644 --- a/battstat/Makefile.am +++ b/battstat/Makefile.am @@ -25,6 +25,7 @@ DIST_SUBDIRS = docs sounds apmlib AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(HAL_CFLAGS) \ $(UPOWER_CFLAGS) \ @@ -34,10 +35,10 @@ AM_CPPFLAGS = \ -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\" -libexec_PROGRAMS = battstat-applet-2 +libexec_PROGRAMS = battstat-applet -battstat_applet_2_SOURCES = \ +battstat_applet_SOURCES = \ battstat.h \ pixmaps.h \ properties.c \ @@ -53,8 +54,9 @@ battstat_applet_2_SOURCES = \ battstat-upower.h -battstat_applet_2_LDADD = \ +battstat_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(LIBNOTIFY_LIBS) \ $(HAL_LIBS) \ $(APMLIB) \ @@ -91,7 +93,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files) CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = battstat-applet-menu.xml EXTRA_DIST = \ diff --git a/battstat/battstat-upower.c b/battstat/battstat-upower.c index b0838176..792be860 100644 --- a/battstat/battstat-upower.c +++ b/battstat/battstat-upower.c @@ -325,15 +325,9 @@ error_dialog( const char *fmt , ...) dialog = gtk_message_dialog_new( NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", str); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect_swapped( G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), G_OBJECT (dialog) ); -#else - g_signal_connect_swapped( GTK_OBJECT (dialog), "response", - G_CALLBACK (gtk_widget_destroy), - GTK_OBJECT (dialog) ); -#endif gtk_widget_show_all( dialog ); } diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c index 9de1ff7c..1c9d10c9 100644 --- a/battstat/battstat_applet.c +++ b/battstat/battstat_applet.c @@ -44,6 +44,8 @@ #include <libnotify/notify.h> #endif +#include <libmate-desktop/mate-aboutdialog.h> + #include "battstat.h" #include "pixmaps.h" @@ -382,15 +384,9 @@ battstat_error_dialog( GtkWidget *applet, const char *msg ) gtk_window_set_screen( GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (applet)) ); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect_swapped( G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), G_OBJECT (dialog) ); -#else - g_signal_connect_swapped( GTK_OBJECT (dialog), "response", - G_CALLBACK (gtk_widget_destroy), - GTK_OBJECT (dialog) ); -#endif gtk_widget_show_all( dialog ); } @@ -513,15 +509,9 @@ battery_full_dialog (GtkWidget *applet) GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect_swapped (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), G_OBJECT (dialog)); -#else - g_signal_connect_swapped (GTK_OBJECT (dialog), "response", - G_CALLBACK (gtk_widget_destroy), - GTK_OBJECT (dialog)); -#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); hbox = gtk_hbox_new (FALSE, 6); @@ -677,11 +667,7 @@ battery_low_dialog( ProgressData *battery, BatteryStatus *info ) gtk_dialog_set_default_response( GTK_DIALOG (battery->battery_low_dialog), GTK_RESPONSE_ACCEPT ); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect_swapped( G_OBJECT (battery->battery_low_dialog), -#else - g_signal_connect_swapped( GTK_OBJECT (battery->battery_low_dialog), -#endif "response", G_CALLBACK (battery_low_dialog_destroy), battery ); @@ -1018,12 +1004,8 @@ copy_gdk_pixmap( GdkPixmap *src, GdkGC *gc ) gint height, width; GdkPixmap *dest; - #if GTK_CHECK_VERSION(3, 0, 0) width = gdk_window_get_width(GDK_WINDOW(src)); height = gdk_window_get_height(GDK_WINDOW(src)); - #else - gdk_drawable_get_size(GDK_DRAWABLE(src), &width, &height); - #endif dest = gdk_pixmap_new( GDK_DRAWABLE( src ), width, height, -1 ); @@ -1420,7 +1402,7 @@ about_cb( GtkAction *action, ProgressData *battstat ) /* true */ _("HAL backend enabled.") : /* false */ _("Legacy (non-HAL) backend enabled."))); - gtk_show_about_dialog( NULL, + mate_show_about_dialog( NULL, "version", VERSION, "copyright", "\xC2\xA9 2000 The Gnulix Society, " "\xC2\xA9 2002-2005 Free Software Foundation and " @@ -1747,15 +1729,9 @@ create_layout(ProgressData *battstat) g_object_ref( battstat->status ); g_object_ref( battstat->percent ); g_object_ref( battstat->battery ); -#if GTK_CHECK_VERSION (3, 0, 0) g_object_ref_sink( G_OBJECT( battstat->status ) ); g_object_ref_sink( G_OBJECT( battstat->percent ) ); g_object_ref_sink( G_OBJECT( battstat->battery ) ); -#else - g_object_ref_sink( GTK_OBJECT( battstat->status ) ); - g_object_ref_sink( GTK_OBJECT( battstat->percent ) ); - g_object_ref_sink( GTK_OBJECT( battstat->battery ) ); -#endif /* Let reconfigure_layout know that the table is currently empty. */ battstat->layout.status = LAYOUT_NONE; diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in index f9b6d3ed..9600dfc7 100644 --- a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in +++ b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=BattstatAppletFactory -Location=@LIBEXECDIR@/battstat-applet-2 +Location=@LIBEXECDIR@/battstat-applet _Name=Battstat Factory _Description=Battstat Factory diff --git a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in index b2983113..050fd3c8 100644 --- a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in +++ b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.BattstatAppletFactory -Exec=@LIBEXECDIR@/battstat-applet-2 +Exec=@LIBEXECDIR@/battstat-applet diff --git a/charpick/Makefile.am b/charpick/Makefile.am index b4c7d1d4..365fae44 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -5,16 +5,18 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(GUCHARMAP_CFLAGS) -libexec_PROGRAMS = charpick_applet2 +libexec_PROGRAMS = charpick-applet -charpick_applet2_SOURCES = charpick.c \ +charpick_applet_SOURCES = charpick.c \ charpick.h \ properties.c -charpick_applet2_LDADD = \ +charpick_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(GUCHARMAP_LIBS) appletdir = $(datadir)/mate-panel/applets @@ -45,7 +47,7 @@ gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml %.gschema.xml.in: %.gschema.xml.in.in Makefile $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = charpick-applet-menu.xml CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid diff --git a/charpick/charpick.c b/charpick/charpick.c index 861c29a8..4afab222 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -9,12 +9,9 @@ #ifdef HAVE_GUCHARMAP #include <gucharmap/gucharmap.h> #endif +#include <libmate-desktop/mate-aboutdialog.h> #include "charpick.h" -#if GTK_CHECK_VERSION (3, 0, 0) -#define GTK_OBJECT(x) G_OBJECT(x) -#endif - /* The comment for each char list has the html entity names of the chars */ /* All gunicar codes should end in 0 */ @@ -494,10 +491,10 @@ build_table(charpick_data *p_curr_data) g_object_set_data (G_OBJECT (toggle_button[i]), "unichar", GINT_TO_POINTER(g_utf8_get_char (label))); - g_signal_connect (GTK_OBJECT (toggle_button[i]), "toggled", + g_signal_connect (G_OBJECT (toggle_button[i]), "toggled", G_CALLBACK (toggle_button_toggled_cb), p_curr_data); - g_signal_connect (GTK_OBJECT (toggle_button[i]), "button_press_event", + g_signal_connect (G_OBJECT (toggle_button[i]), "button_press_event", G_CALLBACK (button_press_hack), p_curr_data->applet); } @@ -588,7 +585,7 @@ about (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "copyright", "\xC2\xA9 1998, 2004-2005 GNOME Applets Maintainers " "and others", @@ -773,10 +770,10 @@ charpicker_applet_fill (MatePanelApplet *applet) GDK_SELECTION_CLIPBOARD, utf8_atom, 0); - g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_get", + g_signal_connect (G_OBJECT (curr_data->applet), "selection_get", G_CALLBACK (charpick_selection_handler), curr_data); - g_signal_connect (GTK_OBJECT (curr_data->applet), "selection_clear_event", + g_signal_connect (G_OBJECT (curr_data->applet), "selection_clear_event", G_CALLBACK (selection_clear_cb), curr_data); diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in index c7160c71..f7a9d2b0 100644 --- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in +++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=CharpickerAppletFactory -Location=@LIBEXECDIR@/charpick_applet2 +Location=@LIBEXECDIR@/charpick-applet _Name=Charpicker Applet Factory _Description=Charpicker Applet Factory diff --git a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in index 66669019..bfca2847 100644 --- a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in +++ b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.CharpickerAppletFactory -Exec=@LIBEXECDIR@/charpick_applet2 +Exec=@LIBEXECDIR@/charpick-applet diff --git a/command/Makefile.am b/command/Makefile.am index 42bcaa5e..e9df3c81 100644 --- a/command/Makefile.am +++ b/command/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ -I$(srcdir) \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ $(DISABLE_DEPRECATED_CFLAGS) @@ -8,7 +9,7 @@ APPLET_LOCATION = $(libexecdir)/command-applet libexec_PROGRAMS = command-applet command_applet_SOURCES = command.c -command_applet_LDADD = $(MATE_APPLETS4_LIBS) +command_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) command_applet_CFLAGS = $(WARN_CFLAGS) appletsdir = $(datadir)/mate-panel/applets diff --git a/command/command.c b/command/command.c index dc27ea62..e7113b65 100644 --- a/command/command.c +++ b/command/command.c @@ -27,6 +27,7 @@ #include <glib/gi18n.h> #include <gio/gio.h> #include <gtk/gtk.h> +#include <libmate-desktop/mate-aboutdialog.h> #include <mate-panel-applet.h> #include <mate-panel-applet-gsettings.h> @@ -103,7 +104,7 @@ command_about_callback (GtkAction *action, CommandApplet *command_applet) { const char* authors[] = { "Stefano Karapetsas <[email protected]>", NULL }; - gtk_show_about_dialog(NULL, + mate_show_about_dialog(NULL, "version", VERSION, "copyright", "Copyright © 2013-2014 Stefano Karapetsas", "authors", authors, diff --git a/configure.ac b/configure.ac index cef1e23f..d0880f24 100644 --- a/configure.ac +++ b/configure.ac @@ -11,12 +11,12 @@ AC_CONFIG_MACRO_DIR(m4) dnl *************************************************************************** dnl *** Minimum library versions for MATE-APPLETS *** dnl *************************************************************************** -GLIB_REQUIRED=2.22.0 +GLIB_REQUIRED=2.36.0 GIO_REQUIRED=2.15.3 LIBPANEL4_REQUIRED=1.7.0 LIBGTOP_REQUIRED=2.11.92 LIBXKLAVIER_REQUIRED=4.0 -LIBMATE_DESKTOP_REQUIRED=1.7.3 +LIBMATE_DESKTOP_REQUIRED=1.9.0 LIBNOTIFY_REQUIRED=0.7.0 HAL_REQUIRED=0.5.3 UPOWER_REQUIRED=0.9.4 @@ -667,7 +667,6 @@ man/Makefile stickynotes/Makefile stickynotes/pixmaps/Makefile stickynotes/docs/Makefile -stickynotes/data/Makefile trashapplet/Makefile trashapplet/src/Makefile trashapplet/docs/Makefile diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am index 9e821585..ea9ea2aa 100644 --- a/cpufreq/Makefile.am +++ b/cpufreq/Makefile.am @@ -30,7 +30,7 @@ org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files) builder_DATA = cpufreq-preferences.ui -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = cpufreq-applet-menu.xml CLEANFILES = \ diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am index a30d3513..9d0a1140 100644 --- a/cpufreq/src/Makefile.am +++ b/cpufreq/src/Makefile.am @@ -5,8 +5,9 @@ endif SUBDIRS = $(selector_SUBDIR) AM_CPPFLAGS = \ - -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\" \ + -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate/ui"\" \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(LIBGLADE_CFLAGS) \ $(DBUS_CFLAGS) @@ -31,6 +32,7 @@ mate_cpufreq_applet_SOURCES = \ mate_cpufreq_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(LIBGLADE_LIBS) \ $(LIBCPUFREQ_LIBS) \ $(DBUS_LIBS) diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index b066c919..a053da5a 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -32,6 +32,7 @@ #include <mate-panel-applet.h> #include <mate-panel-applet-gsettings.h> #include <glib/gi18n.h> +#include <libmate-desktop/mate-aboutdialog.h> #include <stdlib.h> #include <string.h> @@ -98,11 +99,7 @@ static void cpufreq_applet_update (CPUFreqApplet *applet, CPUFreqMonitor *monitor); static void cpufreq_applet_refresh (CPUFreqApplet *applet); -#if GTK_CHECK_VERSION (3, 0, 0) static void cpufreq_applet_dispose (GObject *widget); -#else -static void cpufreq_applet_destroy (GtkObject *widget); -#endif static gboolean cpufreq_applet_button_press (GtkWidget *widget, GdkEventButton *event); static gboolean cpufreq_applet_key_press (GtkWidget *widget, @@ -227,18 +224,10 @@ static void cpufreq_applet_class_init (CPUFreqAppletClass *klass) { MatePanelAppletClass *applet_class = MATE_PANEL_APPLET_CLASS (klass); -#if GTK_CHECK_VERSION (3, 0, 0) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); -#else - GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); -#endif GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); -#if GTK_CHECK_VERSION (3, 0, 0) gobject_class->dispose = cpufreq_applet_dispose; -#else - gtkobject_class->destroy = cpufreq_applet_destroy; -#endif widget_class->size_allocate = cpufreq_applet_size_allocate; #if GTK_CHECK_VERSION (3, 0, 0) @@ -253,11 +242,7 @@ cpufreq_applet_class_init (CPUFreqAppletClass *klass) } static void -#if GTK_CHECK_VERSION (3, 0, 0) cpufreq_applet_dispose (GObject *widget) -#else -cpufreq_applet_destroy (GtkObject *widget) -#endif { CPUFreqApplet *applet; gint i; @@ -286,11 +271,7 @@ cpufreq_applet_destroy (GtkObject *widget) applet->popup = NULL; } -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS (cpufreq_applet_parent_class)->dispose (widget); -#else - GTK_OBJECT_CLASS (cpufreq_applet_parent_class)->destroy (widget); -#endif } static void @@ -686,7 +667,7 @@ cpufreq_applet_about_cb (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "copyright", "\xC2\xA9 2004 Carlos Garcia Campos", "comments", _("This utility shows the current CPU " diff --git a/cpufreq/src/cpufreq-selector/main.c b/cpufreq/src/cpufreq-selector/main.c index 44518c3e..37734172 100644 --- a/cpufreq/src/cpufreq-selector/main.c +++ b/cpufreq/src/cpufreq-selector/main.c @@ -183,8 +183,6 @@ main (gint argc, gchar **argv) } #endif - g_type_init (); - context = g_option_context_new ("- CPUFreq Selector"); g_option_context_add_main_entries (context, options, NULL); diff --git a/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in index f1249cd2..6864e82b 100644 --- a/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in +++ b/cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in @@ -7,7 +7,7 @@ <policyconfig> <vendor>The MATE Project</vendor> - <vendor_url>http://www.mate.org/</vendor_url> + <vendor_url>http://www.mate-desktop.org</vendor_url> <icon_name>mate-cpu-frequency-applet</icon_name> <action id="org.mate.cpufreqselector"> diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am index 46a6c195..b2e99df5 100644 --- a/drivemount/Makefile.am +++ b/drivemount/Makefile.am @@ -4,19 +4,21 @@ AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \ - $(MATE_APPLETS4_CFLAGS) + $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) -libexec_PROGRAMS = drivemount_applet2 +libexec_PROGRAMS = drivemount-applet -drivemount_applet2_SOURCES = \ +drivemount_applet_SOURCES = \ drivemount.c \ drive-list.c \ drive-list.h \ drive-button.c \ drive-button.h -drivemount_applet2_LDADD = \ - $(MATE_APPLETS4_LIBS) +drivemount_applet_LDADD = \ + $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) appletdir = $(datadir)/mate-panel/applets @@ -40,7 +42,7 @@ org.mate.panel.applet.DriveMountAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = drivemount-applet-menu.xml CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c index be8b4fa5..51f13c1c 100644 --- a/drivemount/drive-button.c +++ b/drivemount/drive-button.c @@ -53,11 +53,7 @@ static void drive_button_set_mount (DriveButton *self, static void drive_button_reset_popup (DriveButton *self); static void drive_button_ensure_popup (DriveButton *self); -#if GTK_CHECK_VERSION (3, 0, 0) static void drive_button_dispose (GObject *object); -#else -static void drive_button_destroy (GtkObject *object); -#endif #if 0 static void drive_button_unrealize (GtkWidget *widget); #endif /* 0 */ @@ -71,11 +67,7 @@ static void drive_button_theme_change (GtkIconTheme *icon_theme, static void drive_button_class_init (DriveButtonClass *class) { -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS(class)->dispose = drive_button_dispose; -#else - GTK_OBJECT_CLASS(class)->destroy = drive_button_destroy; -#endif GTK_WIDGET_CLASS(class)->button_press_event = drive_button_button_press; GTK_WIDGET_CLASS(class)->key_press_event = drive_button_key_press; @@ -142,11 +134,7 @@ drive_button_new_from_mount (GMount *mount) } static void -#if GTK_CHECK_VERSION (3, 0, 0) drive_button_dispose (GObject *object) -#else -drive_button_destroy (GtkObject *object) -#endif { DriveButton *self = DRIVE_BUTTON (object); @@ -158,13 +146,8 @@ drive_button_destroy (GtkObject *object) drive_button_reset_popup (self); -#if GTK_CHECK_VERSION (3, 0, 0) if (G_OBJECT_CLASS (drive_button_parent_class)->dispose) (* G_OBJECT_CLASS (drive_button_parent_class)->dispose) (object); -#else - if (GTK_OBJECT_CLASS (drive_button_parent_class)->destroy) - (* GTK_OBJECT_CLASS (drive_button_parent_class)->destroy) (object); -#endif } #if 0 @@ -476,11 +459,7 @@ static void drive_button_reset_popup (DriveButton *self) { if (self->popup_menu) -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_destroy (GTK_WIDGET (self->popup_menu)); -#else - gtk_object_destroy (GTK_OBJECT (self->popup_menu)); -#endif self->popup_menu = NULL; } @@ -623,11 +602,7 @@ open_drive (DriveButton *self, GtkWidget *item) else gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "Could not find Caja", NULL); g_signal_connect (dialog, "response", -#if GTK_CHECK_VERSION (3, 0, 0) G_CALLBACK (gtk_widget_destroy), NULL); -#else - G_CALLBACK (gtk_object_destroy), NULL); -#endif gtk_widget_show (dialog); g_error_free (error); } diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c index 26163160..e249482f 100644 --- a/drivemount/drive-list.c +++ b/drivemount/drive-list.c @@ -35,11 +35,7 @@ G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_TABLE); static GVolumeMonitor *volume_monitor = NULL; static void drive_list_finalize (GObject *object); -#if GTK_CHECK_VERSION (3, 0, 0) static void drive_list_dispose (GObject *object); -#else -static void drive_list_destroy (GtkObject *object); -#endif static void drive_list_add (GtkContainer *container, GtkWidget *child); static void drive_list_remove (GtkContainer *container, GtkWidget *child); @@ -74,11 +70,7 @@ static void drive_list_class_init (DriveListClass *class) { G_OBJECT_CLASS (class)->finalize = drive_list_finalize; -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS (class)->dispose = drive_list_dispose; -#else - GTK_OBJECT_CLASS (class)->destroy = drive_list_destroy; -#endif GTK_CONTAINER_CLASS (class)->add = drive_list_add; GTK_CONTAINER_CLASS (class)->remove = drive_list_remove; } @@ -152,11 +144,7 @@ drive_list_finalize (GObject *object) } static void -#if GTK_CHECK_VERSION (3, 0, 0) drive_list_dispose (GObject *object) -#else -drive_list_destroy (GtkObject *object) -#endif { DriveList *self = DRIVE_LIST (object); @@ -177,13 +165,8 @@ drive_list_destroy (GtkObject *object) g_source_remove (self->layout_tag); self->layout_tag = 0; -#if GTK_CHECK_VERSION (3, 0, 0) if (G_OBJECT_CLASS (drive_list_parent_class)->dispose) (* G_OBJECT_CLASS (drive_list_parent_class)->dispose) (object); -#else - if (GTK_OBJECT_CLASS (drive_list_parent_class)->destroy) - (* GTK_OBJECT_CLASS (drive_list_parent_class)->destroy) (object); -#endif } static void diff --git a/drivemount/drivemount.c b/drivemount/drivemount.c index 60fa1457..90362970 100644 --- a/drivemount/drivemount.c +++ b/drivemount/drivemount.c @@ -28,6 +28,7 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> +#include <libmate-desktop/mate-aboutdialog.h> #include <mate-panel-applet.h> #include "drive-list.h" @@ -112,7 +113,7 @@ display_about_dialog (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "copyright", "Copyright \xC2\xA9 2004 Canonical Ltd", "comments", _("Applet for mounting and unmounting block volumes."), diff --git a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in index 376c9447..2cff60f5 100644 --- a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in +++ b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=DriveMountAppletFactory -Location=@LIBEXECDIR@/drivemount_applet2 +Location=@LIBEXECDIR@/drivemount-applet _Name=Drive Mount Applet Factory _Description=Factory for drive mount applet diff --git a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in index 454d0a1f..898c4f09 100644 --- a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in +++ b/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.DriveMountAppletFactory -Exec=@LIBEXECDIR@/drivemount_applet2 +Exec=@LIBEXECDIR@/drivemount-applet diff --git a/geyes/Makefile.am b/geyes/Makefile.am index 791d36fa..d23fa119 100644 --- a/geyes/Makefile.am +++ b/geyes/Makefile.am @@ -4,19 +4,21 @@ AM_CPPFLAGS = \ -I. \ -I$(srcdir) \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ -I$(includedir) \ -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \ -DGEYES_MENU_UI_DIR=\""$(uidir)"\" -libexec_PROGRAMS = geyes_applet2 +libexec_PROGRAMS = geyes-applet -geyes_applet2_SOURCES = \ +geyes_applet_SOURCES = \ geyes.c \ themes.c \ geyes.h -geyes_applet2_LDADD = \ +geyes_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ -lm appletdir = $(datadir)/mate-panel/applets @@ -40,7 +42,7 @@ org.mate.panel.applet.GeyesAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = geyes-applet-menu.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/geyes/geyes.c b/geyes/geyes.c index 07c17256..161c1682 100644 --- a/geyes/geyes.c +++ b/geyes/geyes.c @@ -20,6 +20,7 @@ #include <config.h> #include <math.h> #include <stdlib.h> +#include <libmate-desktop/mate-aboutdialog.h> #include <mate-panel-applet.h> #include <mate-panel-applet-gsettings.h> #include "geyes.h" @@ -191,7 +192,7 @@ about_cb (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "comments", _("A goofy set of eyes for the MATE " "panel. They follow your mouse."), @@ -303,11 +304,7 @@ create_eyes (MatePanelApplet *applet) } static void -#if GTK_CHECK_VERSION (3, 0, 0) dispose_cb (GObject *object, EyesApplet *eyes_applet) -#else -destroy_cb (GtkObject *object, EyesApplet *eyes_applet) -#endif { g_return_if_fail (eyes_applet); @@ -445,13 +442,8 @@ geyes_applet_fill (MatePanelApplet *applet) G_CALLBACK (applet_back_change), eyes_applet); g_signal_connect (eyes_applet->vbox, -#if GTK_CHECK_VERSION (3, 0, 0) "dispose", G_CALLBACK (dispose_cb), -#else - "destroy", - G_CALLBACK (destroy_cb), -#endif eyes_applet); gtk_widget_show_all (GTK_WIDGET (eyes_applet->applet)); diff --git a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in index d512ed20..d2080905 100644 --- a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in +++ b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=GeyesAppletFactory -Location=@LIBEXECDIR@/geyes_applet2 +Location=@LIBEXECDIR@/geyes-applet _Name=Geyes Applet Factory _Description=Geyes Applet Factory diff --git a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in index 783f42b4..f1363812 100644 --- a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in +++ b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.GeyesAppletFactory -Exec=@LIBEXECDIR@/geyes_applet2 +Exec=@LIBEXECDIR@/geyes-applet diff --git a/geyes/themes.c b/geyes/themes.c index f7df773b..9af46d4b 100644 --- a/geyes/themes.c +++ b/geyes/themes.c @@ -46,11 +46,7 @@ void theme_dirs_create (void) theme_directories[0] = g_build_filename(GEYES_THEMES_DIR, NULL); - #if GLIB_CHECK_VERSION(2, 6, 0) theme_directories[1] = g_build_filename(g_get_user_config_dir(), "mate", "geyes-themes", NULL); - #else // glib version < 2.6.0 - theme_directories[1] = g_build_filename(g_get_home_dir(), ".config", "mate", "geyes-themes", NULL); - #endif themes_created = TRUE; } diff --git a/invest-applet/invest/applet.py b/invest-applet/invest/applet.py index 4a0b83ce..2210599f 100644 --- a/invest-applet/invest/applet.py +++ b/invest-applet/invest/applet.py @@ -139,7 +139,6 @@ class InvestmentsListWindow(Gtk.Window): screen = window.get_screen() monitor = screen.get_monitor_geometry (screen.get_monitor_at_window (window)) (ret, ax, ay) = window.get_origin() - (aw, ah) = self.applet.window.get_size () (ignored, ignored, aw, ah) = window.get_geometry() else: screen = self.applet.get_screen() diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am index 9b0e27c0..db2f004c 100644 --- a/mateweather/Makefile.am +++ b/mateweather/Makefile.am @@ -7,14 +7,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DMATEWEATHER_MENU_UI_DIR=\""$(uidir)"\" \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(LIBMATEWEATHER_CFLAGS) \ $(NETWORKMANAGER_CFLAGS) \ $(DBUS_CFLAGS) -libexec_PROGRAMS = mateweather-applet-2 +libexec_PROGRAMS = mateweather-applet -mateweather_applet_2_SOURCES = \ +mateweather_applet_SOURCES = \ mateweather.h \ main.c \ mateweather-about.c mateweather-about.h \ @@ -22,15 +23,16 @@ mateweather_applet_2_SOURCES = \ mateweather-dialog.c mateweather-dialog.h \ mateweather-applet.c mateweather-applet.h -mateweather_applet_2_LDADD = \ +mateweather_applet_LDADD = \ $(LIBNOTIFY_LIBS) \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(MATE_LIBS2_LIBS) \ $(LIBMATEWEATHER_LIBS) \ $(NETWORKMANAGER_LIBS) \ $(DBUS_LIBS) -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = mateweather-applet-menu.xml appletdir = $(datadir)/mate-panel/applets diff --git a/mateweather/mateweather-about.c b/mateweather/mateweather-about.c index 424260f7..2fb72b34 100644 --- a/mateweather/mateweather-about.c +++ b/mateweather/mateweather-about.c @@ -18,6 +18,8 @@ #include <stdlib.h> #include <assert.h> +#include <libmate-desktop/mate-aboutdialog.h> + #define MATEWEATHER_I_KNOW_THIS_IS_UNSTABLE #include "mateweather.h" @@ -43,7 +45,7 @@ void mateweather_about_run(MateWeatherApplet* gw_applet) NULL }; - gtk_show_about_dialog(NULL, + mate_show_about_dialog(NULL, "version", VERSION, "copyright", _("\xC2\xA9 1999-2005 by S. Papadimitriou and others"), "comments", _("A panel application for monitoring local weather conditions."), diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c index 6383626b..2c0f55c1 100644 --- a/mateweather/mateweather-applet.c +++ b/mateweather/mateweather-applet.c @@ -343,11 +343,7 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet) G_CALLBACK(size_allocate_cb), gw_applet); g_signal_connect (G_OBJECT(gw_applet->applet), "destroy", G_CALLBACK (applet_destroy), gw_applet); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect (G_OBJECT(gw_applet->applet), "button_press_event", -#else - g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event", -#endif G_CALLBACK(clicked_cb), gw_applet); g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event", G_CALLBACK(key_press_cb), gw_applet); diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c index 4ac80e8a..672aa8e9 100644 --- a/mateweather/mateweather-pref.c +++ b/mateweather/mateweather-pref.c @@ -789,11 +789,7 @@ static void mateweather_pref_create(MateWeatherPref* pref) GtkWidget* pref_basic_update_alignment; GtkWidget* pref_basic_update_lbl; GtkWidget* pref_basic_update_hbox; -#if GTK_CHECK_VERSION (3, 0, 0) GObject* pref_basic_update_spin_adj; -#else - GtkObject* pref_basic_update_spin_adj; -#endif GtkWidget* pref_basic_update_sec_lbl; GtkWidget* pref_basic_note_lbl; GtkWidget* pref_loc_hbox; diff --git a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in index af58a727..c0a1a4f6 100644 --- a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in +++ b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=MateWeatherAppletFactory -Location=@LIBEXECDIR@/mateweather-applet-2 +Location=@LIBEXECDIR@/mateweather-applet _Name=Mateweather Applet Factory _Description=Factory for creating the weather applet. diff --git a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in index 2be7b633..e1d0174a 100644 --- a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in +++ b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.MateWeatherAppletFactory -Exec=@LIBEXECDIR@/mateweather-applet-2 +Exec=@LIBEXECDIR@/mateweather-applet diff --git a/multiload/Makefile.am b/multiload/Makefile.am index e6073c5b..43b238e4 100644 --- a/multiload/Makefile.am +++ b/multiload/Makefile.am @@ -8,9 +8,9 @@ AM_CPPFLAGS = \ $(MATEDESKTOP_CFLAGS) \ $(GIO_CFLAGS) -libexec_PROGRAMS = multiload-applet-2 +libexec_PROGRAMS = multiload-applet -multiload_applet_2_SOURCES = \ +multiload_applet_SOURCES = \ global.h \ linux-proc.h \ load-graph.h \ @@ -22,7 +22,7 @@ multiload_applet_2_SOURCES = \ autoscaler.c \ autoscaler.h -multiload_applet_2_LDADD = \ +multiload_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ $(GTOP_APPLETS_LIBS) \ $(MATEDESKTOP_LIBS) \ @@ -42,7 +42,7 @@ EXTRA_DIST = \ $(gsettings_SCHEMAS).in.in \ $(ui_DATA) -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = multiload-applet-menu.xml appletdir = $(datadir)/mate-panel/applets diff --git a/multiload/global.h b/multiload/global.h index a480f11c..52e25db6 100644 --- a/multiload/global.h +++ b/multiload/global.h @@ -40,12 +40,7 @@ struct _LoadGraph { #endif GtkWidget *main_widget; GtkWidget *frame, *box, *disp; -#if GTK_CHECK_VERSION (3, 0, 0) cairo_surface_t *surface; -#else - GdkPixmap *pixmap; - GdkGC *gc; -#endif int timer_index; gint show_frame; diff --git a/multiload/load-graph.c b/multiload/load-graph.c index ec14156e..a6508056 100644 --- a/multiload/load-graph.c +++ b/multiload/load-graph.c @@ -50,105 +50,45 @@ load_graph_draw (LoadGraph *g) { GtkStyle *style; guint i, j; -#if GTK_CHECK_VERSION (3, 0, 0) cairo_t *cr; -#endif /* we might get called before the configure event so that * g->disp->allocation may not have the correct size * (after the user resized the applet in the prop dialog). */ -#if GTK_CHECK_VERSION (3, 0, 0) if (!g->surface) g->surface = gdk_window_create_similar_surface (gtk_widget_get_window (g->disp), CAIRO_CONTENT_COLOR, g->draw_width, g->draw_height); -#else - if (!g->pixmap) - g->pixmap = gdk_pixmap_new (gtk_widget_get_window (g->disp), - g->draw_width, g->draw_height, - gtk_widget_get_visual (g->disp)->depth); -#endif style = gtk_widget_get_style (g->disp); -#if GTK_CHECK_VERSION (3, 0, 0) cr = cairo_create (g->surface); cairo_set_line_width (cr, 1.0); - cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE); -#else - /* Create GC if necessary. */ - if (!g->gc) - { - g->gc = gdk_gc_new (gtk_widget_get_window (g->disp)); - gdk_gc_copy (g->gc, style->black_gc); - } - - /* Allocate colors. */ - if (!g->colors_allocated) - { - GdkColormap *colormap; - - colormap = gdk_drawable_get_colormap (gtk_widget_get_window (g->disp)); - - for (i = 0; i < g->n; i++) - gdk_colormap_alloc_color (colormap, &(g->colors [i]), - FALSE, TRUE); - - g->colors_allocated = 1; - } - - /* Erase Rectangle */ - gdk_draw_rectangle (g->pixmap, - style->black_gc, - TRUE, 0, 0, - g->draw_width, - g->draw_height); -#endif + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND); for (i = 0; i < g->draw_width; i++) g->pos [i] = g->draw_height - 1; for (j = 0; j < g->n; j++) { -#if GTK_CHECK_VERSION (3, 0, 0) gdk_cairo_set_source_color (cr, &(g->colors [j])); -#else - gdk_gc_set_foreground (g->gc, &(g->colors [j])); -#endif for (i = 0; i < g->draw_width; i++) { if (g->data [i][j] != 0) { -#if GTK_CHECK_VERSION (3, 0, 0) cairo_move_to (cr, g->draw_width - i - 0.5, g->pos[i] + 0.5); cairo_line_to (cr, g->draw_width - i - 0.5, g->pos[i] - (g->data [i][j] - 0.5)); -#else - gdk_draw_line (g->pixmap, g->gc, - g->draw_width - i - 1, - g->pos[i], - g->draw_width - i - 1, - g->pos[i] - (g->data [i][j] - 1)); -#endif g->pos [i] -= g->data [i][j]; } } -#if GTK_CHECK_VERSION (3, 0, 0) cairo_stroke (cr); -#endif } -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_queue_draw (g->disp); -#else - gdk_draw_drawable (gtk_widget_get_window (g->disp), - style->fg_gc [gtk_widget_get_state (g->disp)], - g->pixmap, - 0, 0, - 0, 0, - g->draw_width, - g->draw_height); -#endif + + cairo_destroy (cr); } /* Updates the load graph when the timeout expires */ @@ -191,22 +131,10 @@ load_graph_unalloc (LoadGraph *g) g->size = g_settings_get_int(g->multiload->settings, "size"); g->size = MAX (g->size, 10); -#if GTK_CHECK_VERSION (3, 0, 0) if (g->surface) { cairo_surface_destroy (g->surface); g->surface = NULL; } -#else - if (g->pixmap) { - g_object_unref (g->pixmap); - g->pixmap = NULL; - } - - if (g->gc) { - g_object_unref (g->gc); - g->gc = NULL; - } -#endif g->allocated = FALSE; } @@ -249,32 +177,11 @@ load_graph_configure (GtkWidget *widget, GdkEventConfigure *event, load_graph_alloc (c); -#if GTK_CHECK_VERSION (3, 0, 0) if (!c->surface) c->surface = gdk_window_create_similar_surface (gtk_widget_get_window (c->disp), CAIRO_CONTENT_COLOR, c->draw_width, c->draw_height); gtk_widget_queue_draw (widget); -#else - if (!c->pixmap) - c->pixmap = gdk_pixmap_new (gtk_widget_get_window (c->disp), - c->draw_width, - c->draw_height, - gtk_widget_get_visual (c->disp)->depth); - - gdk_draw_rectangle (c->pixmap, - (gtk_widget_get_style (widget))->black_gc, - TRUE, 0,0, - c->draw_width, - c->draw_height); - gdk_draw_drawable (gtk_widget_get_window (widget), - (gtk_widget_get_style (c->disp))->fg_gc [gtk_widget_get_state (widget)], - c->pixmap, - 0, 0, - 0, 0, - c->draw_width, - c->draw_height); -#endif return TRUE; } @@ -290,16 +197,18 @@ load_graph_expose (GtkWidget *widget, { LoadGraph *g = (LoadGraph *) data_ptr; -#if GTK_CHECK_VERSION (3, 0, 0) +#if !GTK_CHECK_VERSION (3, 0, 0) + cairo_t *cr; + cr = gdk_cairo_create (event->window); + gdk_cairo_region (cr, event->region); + cairo_clip (cr); +#endif + cairo_set_source_surface (cr, g->surface, 0, 0); cairo_paint (cr); -#else - gdk_draw_drawable (gtk_widget_get_window (widget), - (gtk_widget_get_style (widget))->fg_gc [gtk_widget_get_state (widget)], - g->pixmap, - event->area.x, event->area.y, - event->area.x, event->area.y, - event->area.width, event->area.height); + +#if !GTK_CHECK_VERSION (3, 0, 0) + cairo_destroy (cr); #endif return FALSE; diff --git a/multiload/main.c b/multiload/main.c index 6efa2e31..b8e065bb 100644 --- a/multiload/main.c +++ b/multiload/main.c @@ -30,6 +30,7 @@ #include <mate-panel-applet.h> #include <mate-panel-applet-gsettings.h> +#include <libmate-desktop/mate-aboutdialog.h> #if GTK_CHECK_VERSION (3, 0, 0) #define MATE_DESKTOP_USE_UNSTABLE_API #include <libmate-desktop/mate-desktop-utils.h> @@ -58,7 +59,7 @@ about_cb (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "copyright", "\xC2\xA9 1999-2005 Free Software Foundation " "and others", diff --git a/multiload/netspeed.c b/multiload/netspeed.c index 0b816719..7d46ec7a 100644 --- a/multiload/netspeed.c +++ b/multiload/netspeed.c @@ -31,12 +31,12 @@ void netspeed_add(NetSpeed *ns, gulong tx) ns->states[ns->cur] = tx; } -/* Something very similar to g_format_size_for_display() but for rates. +/* Something very similar to g_format_size() but for rates. * This should give the same display as in g-s-m */ static char* format_rate_for_display(guint rate) { - char* bytes = g_format_size_for_display(rate); + char* bytes = g_format_size(rate); return g_strdup_printf(_("%s/s"), bytes); } diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in index f62ca12b..584b0c03 100644 --- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in +++ b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=MultiLoadAppletFactory -Location=@LIBEXECDIR@/multiload-applet-2 +Location=@LIBEXECDIR@/multiload-applet Name=MultiLoad Applet Factory Description=Factory for creating the load applet. diff --git a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in index 8c37aecd..f592f048 100644 --- a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in +++ b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.MultiLoadAppletFactory -Exec=@LIBEXECDIR@/multiload-applet-2 +Exec=@LIBEXECDIR@/multiload-applet diff --git a/po/POTFILES.in b/po/POTFILES.in index c6f4d41c..aa8c9786 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -67,7 +67,6 @@ null_applet/MATE_Panel_WirelessApplet.server.in null_applet/MATE_KeyboardApplet.server.in null_applet/null_applet.c # NB. these are actually separate files -stickynotes/data/MATE_StickyNotesApplet.server.in [type: gettext/ini]stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in stickynotes/stickynotes.c [type: gettext/glade]stickynotes/stickynotes.ui @@ -9,6 +9,7 @@ # Arafat Medini <[email protected]>, 2003 # Ayman Hourieh <[email protected]>, 2004 # Djihed Afifi <[email protected]>, 2007, 2008 +# free_voice <[email protected]>, 2014 # Isam Bayazidi <[email protected]>, 2002 # Khaled Hosny <[email protected]>, 2006, 2007, 2008, 2009, 2010 # moceap <[email protected]>, 2013-2014 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-15 07:42+0000\n" -"Last-Translator: moceap <[email protected]>\n" +"PO-Revision-Date: 2014-03-07 00:16+0000\n" +"Last-Translator: free_voice <[email protected]>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/MATE/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -657,11 +658,11 @@ msgstr "" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "اعدادات تطبيق الأوامر" #: ../command/command.c:139 msgid "Command:" -msgstr "" +msgstr "الاوامر:" #: ../command/command.c:150 msgid "Interval (seconds):" @@ -670,15 +671,15 @@ msgstr "" #: ../command/command.c:161 #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:5 msgid "Show icon" -msgstr "" +msgstr "اظهر أيقونة" #: ../command/command.c:297 msgid "Command Applet" -msgstr "" +msgstr "تطبيق الأوامر" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1 msgid "Command to execute" -msgstr "" +msgstr "الأمر الذي سينفّذ" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2 msgid "Command/script to execute to get the output" @@ -694,7 +695,7 @@ msgstr "" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:6 msgid "If applet icon is shown or not" -msgstr "" +msgstr "اذا كانت أيقونت التطبيق ظاهرة أو لا" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" @@ -1194,7 +1195,7 @@ msgstr "ال_عنوان:" #. setup show-notifications button #: ../mateweather/mateweather-pref.c:1038 msgid "Show _notifications" -msgstr "" +msgstr "اعرض الإشعارات" #: ../mateweather/mateweather-pref.c:1048 msgid "Update" @@ -1460,15 +1461,15 @@ msgstr "عنْ" #: ../invest-applet/invest/applet.py:28 msgid "Help" -msgstr "" +msgstr "مساعدة" #: ../invest-applet/invest/applet.py:29 msgid "Preferences" -msgstr "" +msgstr "التفضيلات" #: ../invest-applet/invest/applet.py:30 msgid "Refresh" -msgstr "" +msgstr "تحديث" #. a) We aren't configured yet #: ../invest-applet/invest/applet.py:62 @@ -2383,23 +2384,23 @@ msgstr "ملاحظات لاصقة لبيئة سطح المكتب متّة" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:1 msgid "Name of timer" -msgstr "" +msgstr "اسم عداد الوقت" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:2 msgid "Duration of timer in seconds" -msgstr "" +msgstr "مدة المؤقّت بالثواني" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:3 msgid "Show notification popup when timer finish" -msgstr "" +msgstr "أظهر تنبيهًا منبثقًا عند انتهاء المؤقّت" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:4 msgid "Show dialog window when timer finish" -msgstr "" +msgstr "اظهر نافذة الحوار عند انتهاء المؤقت" #: ../timerapplet/timerapplet.c:77 msgid "_Start timer" -msgstr "" +msgstr "ابدأ المؤقّت" #: ../timerapplet/timerapplet.c:78 msgid "P_ause timer" @@ -2407,7 +2408,7 @@ msgstr "" #: ../timerapplet/timerapplet.c:79 msgid "S_top timer" -msgstr "" +msgstr "انهي المؤقّت" #: ../timerapplet/timerapplet.c:139 msgid "Finished" @@ -2415,7 +2416,7 @@ msgstr "انتهى" #: ../timerapplet/timerapplet.c:146 ../timerapplet/timerapplet.c:158 msgid "Timer finished!" -msgstr "" +msgstr "انتهى المؤقّت !" #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" @@ -2423,31 +2424,31 @@ msgstr "ابدأ مؤقّتًا و استقبل إشعارًا بالإكمال" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" -msgstr "" +msgstr "إعدادات تطبيق المؤقّت" #: ../timerapplet/timerapplet.c:298 msgid "Name:" -msgstr "" +msgstr "الاسم:" #: ../timerapplet/timerapplet.c:310 msgid "Hours:" -msgstr "" +msgstr "ساعة" #: ../timerapplet/timerapplet.c:324 msgid "Minutes:" -msgstr "" +msgstr "دقيقه" #: ../timerapplet/timerapplet.c:338 msgid "Seconds:" -msgstr "" +msgstr "ثانيه" #: ../timerapplet/timerapplet.c:352 msgid "Show notification popup" -msgstr "" +msgstr "أظهر تنبيهًا مُنبثقًا" #: ../timerapplet/timerapplet.c:358 msgid "Show dialog" -msgstr "" +msgstr "أعرض الحوار" #: ../timerapplet/timerapplet.c:376 msgid "Timer Applet" @@ -5,13 +5,15 @@ # Translators: # Alex Nehaichik <[email protected]>, 2003-2004 # Ihar Hrachyshka <[email protected]>, 2006 +# meequz <[email protected]>, 2014 +# meequz <[email protected]>, 2014 # Vital Khilko <[email protected]>, 2002-2003,2014 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-27 09:08+0000\n" +"PO-Revision-Date: 2014-03-28 13:41+0000\n" "Last-Translator: meequz <[email protected]>\n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/MATE/language/be/)\n" "MIME-Version: 1.0\n" @@ -157,10 +159,10 @@ msgstr "Невядомы час (%d%%) да поўнага насілкоўва� #, c-format msgid "%d minute (%d%%) remaining" msgid_plural "%d minutes (%d%%) remaining" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%d хвіліна (%d%%) засталася" +msgstr[1] "%d хвіліны (%d%%) засталося" +msgstr[2] "%d хвілін (%d%%) засталося" +msgstr[3] "%d хвілін (%d%%) засталося" #: ../battstat/battstat_applet.c:425 #, c-format @@ -331,7 +333,7 @@ msgstr "Настáўленні назіральніка за батарэяй" #: ../battstat/battstat_applet.ui.h:2 msgid "Appearance" -msgstr "Знешні выгляд" +msgstr "Выгляд" #: ../battstat/battstat_applet.ui.h:3 msgid "_Compact view" @@ -631,11 +633,11 @@ msgstr "Настáўленні палітры знакаў" #: ../command/command.c:110 msgid "Shows the output of a command" -msgstr "" +msgstr "Паказавае вывад пэўнага загаду" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "Настáўленні аплета загаду" #: ../command/command.c:139 msgid "Command:" @@ -676,7 +678,7 @@ msgstr "" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" -msgstr "Настáўленні назіральніка за частатой працэсара" +msgstr "Настáўленні назіральніка за чашчынёй працэсара" #: ../cpufreq/cpufreq-preferences.ui.h:2 msgid "Monitor Settings" @@ -692,28 +694,28 @@ msgstr "Настáўленні выгляду" #: ../cpufreq/cpufreq-preferences.ui.h:5 msgid "_Appearance:" -msgstr "_Знешні выгляд:" +msgstr "_Выгляд:" #: ../cpufreq/cpufreq-preferences.ui.h:6 msgid "Show CPU frequency as _frequency" -msgstr "Паказваць частату працэсара як _частату" +msgstr "Паказваць чашчыню працэсара як _частату" #: ../cpufreq/cpufreq-preferences.ui.h:7 msgid "Show frequency _units" -msgstr "Паказваць частату ў _адзінках" +msgstr "Паказваць чашчыню ў _адзінках" #: ../cpufreq/cpufreq-preferences.ui.h:8 msgid "Show CPU frequency as _percentage" -msgstr "Паказваць частату працэсара ў _адсотках" +msgstr "Паказваць чашчыню працэсара ў _адсотках" #: ../cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in.h:1 #: ../cpufreq/src/cpufreq-applet.c:1035 ../cpufreq/src/cpufreq-applet.c:1090 msgid "CPU Frequency Scaling Monitor" -msgstr "Назіральнік за частатой працэсара" +msgstr "Назіральнік за чашчынёй працэсара" #: ../cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in.h:2 msgid "Monitor the CPU Frequency Scaling" -msgstr "Назірае за маштабаваннем частаты CPU" +msgstr "Назірае за маштабаваннем чашчыні CPU" #: ../cpufreq/src/cpufreq-applet.c:665 ../cpufreq/src/cpufreq-prefs.c:394 msgid "Could not open help document" @@ -721,11 +723,11 @@ msgstr "Немагчыма адкрыць дакумент даведкі" #: ../cpufreq/src/cpufreq-applet.c:692 msgid "This utility shows the current CPU Frequency Scaling." -msgstr "Гэтая ўтыліта паказвае дзейны стан частаты працэсара." +msgstr "Гэтая ўтыліта паказвае дзейны стан чашчыні працэсара." #: ../cpufreq/src/cpufreq-applet.c:1091 msgid "This utility shows the current CPU Frequency" -msgstr "Гэтая ўтыліта паказвае дзейны стан частаты працэсара" +msgstr "Гэтая ўтыліта паказвае дзейны стан чашчыні працэсара" #: ../cpufreq/src/cpufreq-prefs.c:529 msgid "Graphic" @@ -741,7 +743,7 @@ msgstr "Графічна-тэкставы" #: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:117 msgid "Frequency Scaling Unsupported" -msgstr "Змена частаты не падтрымліваецца" +msgstr "Змена чашчыні не падтрымліваецца" #. If there is no cpufreq support it shows only the cpu frequency, #. * I think is better than do nothing. I have to notify it to the user, @@ -749,21 +751,21 @@ msgstr "Змена частаты не падтрымліваецца" #. * he could think that cpufreq is supported but it doesn't work succesfully #: ../cpufreq/src/cpufreq-monitor-factory.c:59 msgid "CPU frequency scaling unsupported" -msgstr "Змена частаты працэсара не падтрымліваецца гэтай сістэмай" +msgstr "Змена чашчыні працэсара не падтрымліваецца гэтай сістэмай" #: ../cpufreq/src/cpufreq-monitor-factory.c:60 msgid "" "You will not be able to modify the frequency of your machine. Your machine " "may be misconfigured or not have hardware support for CPU frequency scaling." -msgstr "Вы не зможаце змяніць частату працэсара гэтай машыны. Вашая машына можа быць няправільна настаўлена, ці апаратура гэтай сістэмы не падтрымлівае змену частаты працэсара." +msgstr "Вы не зможаце змяніць чашчыню працэсара гэтай машыны. Вашая машына можа быць няправільна настаўлена, ці апаратура гэтай сістэмы не падтрымлівае змену чашчыні працэсара." #: ../cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in.h:1 msgid "Change CPU Frequency scaling" -msgstr "Змяніць маштабаванне частаты працэсара" +msgstr "Змяніць маштабаванне чашчыні працэсара" #: ../cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in.h:2 msgid "Privileges are required to change the CPU Frequency scaling." -msgstr "Патрэбуюцца прывілеі, каб змяніць маштабаванне частаты працэсара." +msgstr "Патрэбуюцца прывілеі, каб змяніць маштабаванне чашчыні працэсара." #: ../drivemount/drive-button.c:360 ../drivemount/drive-button.c:373 msgid "(mounted)" @@ -833,7 +835,7 @@ msgstr "Прымантоўвае лакальныя дыскі і прылады #: ../geyes/geyes.c:196 msgid "A goofy set of eyes for the MATE panel. They follow your mouse." -msgstr "Пара вачэй для панэлі MATE. Сочаць за перасоўваннем мышы." +msgstr "Вочы для панэлі MATE. Сочаць за перасоўваннем мышы." #: ../geyes/geyes.c:405 ../geyes/geyes.c:438 ../geyes/geyes.c:440 #: ../geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in.h:2 @@ -1129,7 +1131,7 @@ msgstr "мілібары мэркура" #. TRANSLATOR: The pressure unit "inches of mercury" #: ../mateweather/mateweather-pref.c:937 msgid "inHg" -msgstr "дзюймы мэркура" +msgstr "цалі мэркура" #. TRANSLATOR: The pressure unit "atmospheres" #: ../mateweather/mateweather-pref.c:939 @@ -1411,7 +1413,7 @@ msgstr "" #: ../invest-applet/data/prefs-dialog.ui.h:3 msgid "Stocks" -msgstr "" +msgstr "Акцыі" #: ../invest-applet/data/prefs-dialog.ui.h:4 msgid "" @@ -1451,17 +1453,17 @@ msgstr "Абнавіць" #. a) We aren't configured yet #: ../invest-applet/invest/applet.py:62 msgid "<b>You have not entered any stock information yet</b>" -msgstr "" +msgstr "<b>Вы яшчэ не задалі аніводных акцый</b>" #: ../invest-applet/invest/applet.py:67 msgid "<b>No stock quotes are currently available</b>" -msgstr "" +msgstr "<b>Каціроўкі акцый недаступныя</b>" #: ../invest-applet/invest/applet.py:68 msgid "" "The server could not be contacted. The computer is either offline or the " "servers are down. Try again later." -msgstr "" +msgstr "Не выходзіць злучыцца з серверам. Або кампутар афлайн, або сервер не працуе. Паспрабуйце пазней." #: ../invest-applet/invest/chart.py:160 #, python-format @@ -1502,7 +1504,7 @@ msgstr "Кошт" #: ../invest-applet/invest/preferences.py:34 msgid "Commission" -msgstr "Камісыя" +msgstr "Камісія" #: ../invest-applet/invest/preferences.py:34 msgid "Currency Rate" @@ -1544,7 +1546,7 @@ msgstr "" #. stock was purchased. #: ../invest-applet/invest/widgets.py:58 msgid "Ticker" -msgstr "" +msgstr "Тыкер" #: ../invest-applet/invest/widgets.py:58 msgid "Last" @@ -1820,7 +1822,7 @@ msgstr "_Вышыня сістэмнага назіральніка: " #: ../multiload/properties.c:500 msgid "pixels" -msgstr "піксэлі" +msgstr "піксэляў" #: ../multiload/properties.c:508 msgid "Sys_tem monitor update interval: " @@ -1828,7 +1830,7 @@ msgstr "_Пэрыяд абнаўлення сістэмнага назіраль #: ../multiload/properties.c:534 msgid "milliseconds" -msgstr "мілісекунды" +msgstr "мілісекунд" #: ../multiload/properties.c:545 msgid "Colors" @@ -1872,15 +1874,15 @@ msgstr "_Вольная" #: ../multiload/properties.c:588 msgid "_In" -msgstr "" +msgstr "_Уваходныя пакеты" #: ../multiload/properties.c:589 msgid "_Out" -msgstr "" +msgstr "_Выходныя" #: ../multiload/properties.c:590 msgid "_Local" -msgstr "" +msgstr "_Лакальныя" #: ../multiload/properties.c:591 ../multiload/properties.c:601 #: ../multiload/properties.c:607 @@ -1983,7 +1985,7 @@ msgstr "Некаторыя элементы панэлі больш недаст msgid "" "One or more panel items (also referred to as applets) are no longer " "available in the MATE desktop." -msgstr "Адзін ці болей элементаў панэлі (аплетаў) больш не даступныя ў асяродздзі MATE." +msgstr "Адзін ці болей элементаў панэлі (аплетаў) больш не даступныя ў асяроддзі MATE." #: ../null_applet/null_applet.c:154 msgid "These items will now be removed from your configuration:" @@ -2041,7 +2043,7 @@ msgstr "Настáўленні ліпучых нататак" #: ../stickynotes/stickynotes.ui.h:6 msgid "Default Note Properties" -msgstr "" +msgstr "Стандартныя ўласцівасці нататкі" #: ../stickynotes/stickynotes.ui.h:7 msgid "Choose a font to use for all sticky notes" @@ -2101,19 +2103,19 @@ msgstr "Паводзіны" #: ../stickynotes/stickynotes.ui.h:21 msgid "Hide notes when the des_ktop is clicked on" -msgstr "" +msgstr "Хаваць нататкі па пстрыку на стале" #: ../stickynotes/stickynotes.ui.h:22 msgid "Choose whether to hide all notes when selecting on the desktop" -msgstr "" +msgstr "Ці хаваць усе нататкі, калі пстрыкаеш па стале" #: ../stickynotes/stickynotes.ui.h:23 msgid "Force _default color and font on notes" -msgstr "Скарыстаць ст_андартныя шрыфт і колер для ўсіх нататак" +msgstr "Ужываць ст_андартныя шрыфт і колер для ўсіх нататак" #: ../stickynotes/stickynotes.ui.h:24 msgid "Choose if the default style is forced on all notes" -msgstr "Абярыце, ці ўжываць стандартны стыль для ўсіх нататак" +msgstr "Ці ўжываць стандартны стыль для ўсіх нататак" #: ../stickynotes/stickynotes.ui.h:25 msgid "_Put notes on all workspaces" @@ -2121,7 +2123,7 @@ msgstr "_Размясціць нататкі на ўсіх працоўных п #: ../stickynotes/stickynotes.ui.h:26 msgid "Choose if notes are visible on all workspaces" -msgstr "Абярыце, ці трэба паказваць ліпучыя нататкі на ўсіх працоўных прасторах" +msgstr "Ці трэба паказваць ліпучыя нататкі на ўсіх працоўных прасторах" #: ../stickynotes/stickynotes.ui.h:27 msgid "Delete this sticky note?" @@ -2342,10 +2344,10 @@ msgstr "_Замкнуць нататкі" #, c-format msgid "%d note" msgid_plural "%d notes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%d нататка" +msgstr[1] "%d нататкі" +msgstr[2] "%d нататак" +msgstr[3] "%d нататак" #: ../stickynotes/stickynotes_applet.c:596 msgid "Show sticky notes" @@ -2393,7 +2395,7 @@ msgstr "Таймер скончыўся!" #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" -msgstr "" +msgstr "Запуск таймера і атрыманне абвяшчэння, калі час выйдзе" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" @@ -2454,7 +2456,7 @@ msgstr[3] "%d аб'ектаў у сметніцы" #: ../trashapplet/src/trashapplet.c:138 msgid "No Items in Trash" -msgstr "Няма аб'ектаў у сметніцы" +msgstr "Сметніца пустая" #: ../trashapplet/src/trashapplet.c:392 #, c-format @@ -2467,7 +2469,7 @@ msgstr "Памылка падчас запуску caja:\n%s" msgid "" "A MATE trash bin that lives in your panel. You can use it to view the trash " "or drag and drop items into the trash." -msgstr "Сметніца MATE, што жыве на вашай панэлі. Да магчымасць праглядаць сметніцу і перацягваць у яе аб'екты." +msgstr "Сметніца MATE, што жыве на вашай панэлі. Дае магчымасць праглядаць сметніцу і перацягваць у яе аб'екты." #: ../trashapplet/src/trashapplet.c:466 msgid "Delete Immediately?" @@ -2506,7 +2508,7 @@ msgstr "Выдаліць усе аб'екты ў сметніцы?" msgid "" "If you choose to empty the trash, all items in it will be permanently lost. " "Please note that you can also delete them separately." -msgstr "Калі вы спусташаеце сметніцу, усе ейныя элементы страчваюцца назаўсёды. Заўважце таксама, што вы можаце выдаляць іх паасобку." +msgstr "Калі вы спусташаеце сметніцу, усе ейныя элементы страчваюцца назаўсёды. Заўважце таксама, што іх можна выдаляць паасобку." #: ../trashapplet/trashapplet-empty-progress.ui.h:1 msgid "Emptying the Trash" @@ -14,14 +14,14 @@ # Matthias Warkus <[email protected]>, 1999, 2000 # bambuhle <[email protected]>, 2014 # Forecast <[email protected]>, 2014 -# to_ba, 2014 +# Tobias Bannert, 2014 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-27 14:00+0000\n" -"Last-Translator: to_ba\n" +"PO-Revision-Date: 2014-05-22 21:48+0000\n" +"Last-Translator: Tobias Bannert\n" "Language-Team: German (http://www.transifex.com/projects/p/MATE/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1398,7 +1398,7 @@ msgstr "Diagramm von <b>Yahoo!</b> herunterladen" #: ../invest-applet/data/prefs-dialog.ui.h:1 msgid "Invest Preferences" -msgstr "Börsenticker-Einstellungen" +msgstr "Börsentickereinstellungen" #: ../invest-applet/data/prefs-dialog.ui.h:2 msgid "label" @@ -2006,7 +2006,7 @@ msgstr "Klebezettel" #: ../stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in.h:3 msgid "Create, view, and manage sticky notes on the desktop" -msgstr "Klebezettel auf der Arbeitsfläche anlegen, anzeigen und verwalten" +msgstr "Klebezettel auf dem Schreibtisch anlegen, anzeigen und verwalten" #: ../stickynotes/stickynotes.c:634 msgid "This note is locked." @@ -2098,7 +2098,7 @@ msgstr "Notizen verbergen, wenn der Arbeitsflächenhintergrund ange_klickt wird" #: ../stickynotes/stickynotes.ui.h:22 msgid "Choose whether to hide all notes when selecting on the desktop" -msgstr "Wählen Sie, ob bei ausgewähltem Arbeitsflächenhintergrund alle Notizen verborgen werden sollen" +msgstr "Wählen Sie, ob bei ausgewähltem Schreibtischhintergrund alle Notizen verborgen werden sollen" #: ../stickynotes/stickynotes.ui.h:23 msgid "Force _default color and font on notes" @@ -2258,7 +2258,7 @@ msgstr "Sperrzustand der Klebezettel" #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:14 msgid "Specifies whether the sticky notes are locked (non-editable) or not." -msgstr "Gibt an, ob die Klebezettel gesperrt werden sollen (nicht-editierbar) oder nicht." +msgstr "Gibt an, ob die Klebezettel gesperrt werden sollen (nicht bearbeitbar) oder nicht." #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:15 msgid "Date format of note's title" @@ -2303,13 +2303,13 @@ msgstr "Falls dieser Schlüssel wahr ist, werden einzelnen Zetteln zugewiesene, #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:23 msgid "Whether to hide all notes when the desktop is selected" -msgstr "Legt fest, ob bei ausgewähltem Arbeitsflächenhintergrund alle Notizen verborgen werden sollen" +msgstr "Legt fest, ob bei ausgewähltem Schreibtischhintergrund alle Notizen verborgen werden sollen" #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:24 msgid "" "If this option is enabled, selecting the desktop in any way will " "automatically hide all the open notes." -msgstr "Falls diese Option aktiviert ist, werden beim Aktivieren des Arbeitsflächenhintergrundes automatisch alle geöffneten Notizen verborgen." +msgstr "Falls diese Option aktiviert ist, werden beim Aktivieren des Schreibtischhintergrundes automatisch alle geöffneten Notizen verborgen." #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:25 msgid "Whether to ask for confirmation when deleting a note" @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-16 17:41+0000\n" +"PO-Revision-Date: 2014-03-06 02:14+0000\n" "Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/MATE/language/es/)\n" "MIME-Version: 1.0\n" @@ -144,52 +144,52 @@ msgstr "El sistema está funcionando con baterías" #: ../battstat/battstat_applet.c:411 #, c-format msgid "Battery charged (%d%%)" -msgstr "Batería cargada al (%d%%)" +msgstr "Batería cargada (%d %%)" #: ../battstat/battstat_applet.c:413 #, c-format msgid "Unknown time (%d%%) remaining" -msgstr "Tiempo desconocido, (%d%%) restante" +msgstr "Tiempo desconocido (%d %%) restante" #: ../battstat/battstat_applet.c:415 #, c-format msgid "Unknown time (%d%%) until charged" -msgstr "Tiempo desconocido, (%d%%) hasta su carga" +msgstr "Tiempo desconocido (%d %%) hasta su carga" #: ../battstat/battstat_applet.c:420 #, c-format msgid "%d minute (%d%%) remaining" msgid_plural "%d minutes (%d%%) remaining" -msgstr[0] "Queda %d minuto (%d%%)" -msgstr[1] "Quedan %d minutos (%d%%)" +msgstr[0] "Queda %d minuto (%d %%)" +msgstr[1] "Quedan %d minutos (%d %%)" #: ../battstat/battstat_applet.c:425 #, c-format msgid "%d minute until charged (%d%%)" msgid_plural "%d minutes until charged (%d%%)" msgstr[0] "Falta %d minuto para completar la carga (%d%%)" -msgstr[1] "Faltan %d minutos para completar la carga (%d%%)" +msgstr[1] "Faltan %d minutos para completar la carga (%d %%)" #: ../battstat/battstat_applet.c:431 #, c-format msgid "%d hour (%d%%) remaining" msgid_plural "%d hours (%d%%) remaining" -msgstr[0] "Queda %d hora (%d%%)" -msgstr[1] "Quedan %d horas (%d%%)" +msgstr[0] "Queda %d hora (%d %%)" +msgstr[1] "Quedan %d horas (%d %%)" #: ../battstat/battstat_applet.c:436 #, c-format msgid "%d hour until charged (%d%%)" msgid_plural "%d hours until charged (%d%%)" -msgstr[0] "Falta %d hora para completar la carga (%d%%)" -msgstr[1] "Faltan %d horas para completar la carga (%d%%)" +msgstr[0] "Falta %d hora para completar la carga (%d %%)" +msgstr[1] "Faltan %d horas para completar la carga (%d %%)" #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes" #. * Swap order with "%2$s %2$d %1$s %1$d if needed #: ../battstat/battstat_applet.c:443 #, c-format msgid "%d %s %d %s (%d%%) remaining" -msgstr "Quedan %d %s %d %s (%d%%)" +msgstr "Quedan %d %s %d %s (%d %%)" #: ../battstat/battstat_applet.c:444 ../battstat/battstat_applet.c:451 msgid "hour" @@ -208,7 +208,7 @@ msgstr[1] "minutos" #: ../battstat/battstat_applet.c:450 #, c-format msgid "%d %s %d %s until charged (%d%%)" -msgstr "%d %s %d %s para completar la carga (%d%%)" +msgstr "%d %s %d %s para completar la carga (%d %%)" #: ../battstat/battstat_applet.c:464 msgid "Battery Monitor" @@ -226,7 +226,7 @@ msgstr "Notificación de batería" #: ../battstat/battstat_applet.c:619 #, c-format msgid "You have %d%% of your total battery capacity remaining." -msgstr "Le queda un %d%% de la capacidad total de su batería." +msgstr "Queda un %d %% de la capacidad total de la batería." #: ../battstat/battstat_applet.c:625 #, c-format @@ -234,8 +234,8 @@ msgid "" "You have %d minute of battery power remaining (%d%% of the total capacity)." msgid_plural "" "You have %d minutes of battery power remaining (%d%% of the total capacity)." -msgstr[0] "Queda %d minuto de batería (%d%% de la capacidad total)." -msgstr[1] "Quedan %d minutos de batería (%d%% de la capacidad total)." +msgstr[0] "Queda %d minuto de batería (%d %% de la capacidad total)." +msgstr[1] "Quedan %d minutos de batería (%d %% de la capacidad total)." #. TRANSLATORS: this is a list, it is left as a single string #. * to allow you to make it appear like a list would in your @@ -1700,7 +1700,7 @@ msgid "" "%s:\n" "%u%% in use by programs\n" "%u%% in use as cache" -msgstr "%s:\n%u%% en uso por programas\n%u%% en uso como caché" +msgstr "%s:\n%u %% en uso por programas\n%u %% en uso como caché" #: ../multiload/main.c:298 #, c-format @@ -1724,8 +1724,8 @@ msgid "" msgid_plural "" "%s:\n" "%u%% in use" -msgstr[0] "%s:\n%u%% en uso" -msgstr[1] "%s:\n%u%% en uso" +msgstr[0] "%s:\n%u %% en uso" +msgstr[1] "%s:\n%u %% en uso" #: ../multiload/main.c:347 msgid "CPU Load" @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Asier Iturralde Sarasola <[email protected]>, 2012 +# Asier Iturralde Sarasola <[email protected]>, 2012,2014 # euskara <[email protected]>, 1999 # Hizkuntza Politikarako Sailburuordetza <[email protected]>, 2004, 2005 # Iñaki Larrañaga Murgoitio <[email protected]>, 2004, 2006, 2007, 2008, 2009, 2010 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-03 18:03+0000\n" -"Last-Translator: Stefano Karapetsas <[email protected]>\n" +"PO-Revision-Date: 2014-06-16 21:18+0000\n" +"Last-Translator: Asier Iturralde Sarasola <[email protected]>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/MATE/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -627,7 +627,7 @@ msgstr "" #: ../command/command.c:139 msgid "Command:" -msgstr "" +msgstr "Komandoa:" #: ../command/command.c:150 msgid "Interval (seconds):" @@ -636,7 +636,7 @@ msgstr "" #: ../command/command.c:161 #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:5 msgid "Show icon" -msgstr "" +msgstr "Erakutsi ikonoa" #: ../command/command.c:297 msgid "Command Applet" @@ -1422,19 +1422,19 @@ msgstr "Gainbegiratu inbertitutako dirua." #. name, stock_id, label, accellerator, tooltip, callback #: ../invest-applet/invest/applet.py:27 msgid "About" -msgstr "" +msgstr "Honi buruz" #: ../invest-applet/invest/applet.py:28 msgid "Help" -msgstr "" +msgstr "Laguntza" #: ../invest-applet/invest/applet.py:29 msgid "Preferences" -msgstr "" +msgstr "Hobespenak" #: ../invest-applet/invest/applet.py:30 msgid "Refresh" -msgstr "" +msgstr "Freskatu" #. a) We aren't configured yet #: ../invest-applet/invest/applet.py:62 @@ -9,6 +9,7 @@ # Gabor Sari <saga at mate dot hu>, 2003 # i_sty <[email protected]>, 2014 # i_sty <[email protected]>, 2014 +# kami911 <[email protected]>, 2014 # Laszlo Dvornik <dvornik at mate dot hu>, 2004 # Mate ORY <orymate at gmail d0t com>, 2006 # Rezső Páder <[email protected]>, 2013 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-22 20:47+0000\n" -"Last-Translator: Rezső Páder <[email protected]>\n" +"PO-Revision-Date: 2014-03-29 01:39+0000\n" +"Last-Translator: kami911 <[email protected]>\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/MATE/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -628,7 +629,7 @@ msgstr "Parancs kimenetének megjelenítése" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "A Parancs kisalkalmazás beállításai" #: ../command/command.c:139 msgid "Command:" @@ -645,7 +646,7 @@ msgstr "Ikon megjelenítése" #: ../command/command.c:297 msgid "Command Applet" -msgstr "" +msgstr "Parancs kisalkalmazás" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1 msgid "Command to execute" @@ -653,19 +654,19 @@ msgstr "Végrehajtandó parancs" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2 msgid "Command/script to execute to get the output" -msgstr "" +msgstr "Kimenet megszerzéséhez szükséges parancs vagy parancsfájl" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:3 msgid "Interval for the command" -msgstr "" +msgstr "Parancsvégrehatás ideje" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:4 msgid "Interval to execute the command (in seconds)" -msgstr "" +msgstr "A parancs végrehatására szánt idő (másodpercben megadva)" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:6 msgid "If applet icon is shown or not" -msgstr "" +msgstr "Ha a kisalkalmazás ikonja megjelenik vagy nem jelenik meg" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" @@ -1201,7 +1202,7 @@ msgstr "Hely" #: ../mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in.h:1 msgid "Mateweather Applet Factory" -msgstr "" +msgstr "Mateweather kisalkalmazás factory" #: ../mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in.h:2 msgid "Factory for creating the weather applet." @@ -2350,15 +2351,15 @@ msgstr "Időzítő neve" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:2 msgid "Duration of timer in seconds" -msgstr "" +msgstr "Időzítés másodpercben megadva" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:3 msgid "Show notification popup when timer finish" -msgstr "" +msgstr "Felugró értesítés megjelenítése, amikor lejárt az időzítő." #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:4 msgid "Show dialog window when timer finish" -msgstr "" +msgstr "Párbeszédablak megjelenítése, amikor lejárt az időzítő." #: ../timerapplet/timerapplet.c:77 msgid "_Start timer" @@ -2378,7 +2379,7 @@ msgstr "Kész" #: ../timerapplet/timerapplet.c:146 ../timerapplet/timerapplet.c:158 msgid "Timer finished!" -msgstr "" +msgstr "Lejárt az időzítő." #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" @@ -2386,7 +2387,7 @@ msgstr "Időzítő indítása, és jelzés az idő lejáratakor" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" -msgstr "Időzítő applet beállításai" +msgstr "Időzítő kisalkalmazás beállításai" #: ../timerapplet/timerapplet.c:298 msgid "Name:" @@ -2406,11 +2407,11 @@ msgstr "Másodperc:" #: ../timerapplet/timerapplet.c:352 msgid "Show notification popup" -msgstr "" +msgstr "Felugró értesítés megjelenítése" #: ../timerapplet/timerapplet.c:358 msgid "Show dialog" -msgstr "" +msgstr "Párbeszédablak megjelenítése" #: ../timerapplet/timerapplet.c:376 msgid "Timer Applet" @@ -7,13 +7,14 @@ # Dirgita <[email protected]>, 2010 # dirgita <[email protected]>, 2010 # andjeng, 2013 +# willysr <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-03 18:03+0000\n" -"Last-Translator: Stefano Karapetsas <[email protected]>\n" +"PO-Revision-Date: 2014-03-10 16:08+0000\n" +"Last-Translator: willysr <[email protected]>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/MATE/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -456,11 +457,11 @@ msgstr "0 untuk tanpa label, 1 untuk persentase dan 2 untuk waktu tersisa." #: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:19 msgid "Disable HAL" -msgstr "" +msgstr "Nonaktifkan HAL" #: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:20 msgid "Disable HAL if true" -msgstr "" +msgstr "Nonaktifkan HAL jika true" #. TRANSLATOR: this is a selectable item in a drop-down menu to end #. * this sentence: @@ -611,48 +612,48 @@ msgstr "Preferensi Karakter Palet" #: ../command/command.c:110 msgid "Shows the output of a command" -msgstr "" +msgstr "Tampilkan hasil keluaran dari perintah" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "Preferensi Applet Perintah" #: ../command/command.c:139 msgid "Command:" -msgstr "" +msgstr "Perintah:" #: ../command/command.c:150 msgid "Interval (seconds):" -msgstr "" +msgstr "Interval (detik):" #: ../command/command.c:161 #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:5 msgid "Show icon" -msgstr "" +msgstr "Tampilkan ikon" #: ../command/command.c:297 msgid "Command Applet" -msgstr "" +msgstr "Applet Perintah" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1 msgid "Command to execute" -msgstr "" +msgstr "Perintah untuk dieksekusi" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2 msgid "Command/script to execute to get the output" -msgstr "" +msgstr "Perintah/script untuk dieksekusi untuk mendapatkan hasil keluaran" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:3 msgid "Interval for the command" -msgstr "" +msgstr "Interval untuk perintah" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:4 msgid "Interval to execute the command (in seconds)" -msgstr "" +msgstr "Interval untuk mengeksekusi perintah (dalam detik)" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:6 msgid "If applet icon is shown or not" -msgstr "" +msgstr "Jika ikon applet ditampilkan atau tidak" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" @@ -755,7 +756,7 @@ msgstr "(terlepas)" #: ../drivemount/drive-button.c:614 msgid "Cannot execute Caja" -msgstr "" +msgstr "Tidak dapat mengeksekusi Caja" #: ../drivemount/drive-button.c:616 #, c-format @@ -1152,7 +1153,7 @@ msgstr "_Alamat:" #. setup show-notifications button #: ../mateweather/mateweather-pref.c:1038 msgid "Show _notifications" -msgstr "" +msgstr "Tampilkan _notifikasi" #: ../mateweather/mateweather-pref.c:1048 msgid "Update" @@ -1414,19 +1415,19 @@ msgstr "Melacak investasi uang Anda." #. name, stock_id, label, accellerator, tooltip, callback #: ../invest-applet/invest/applet.py:27 msgid "About" -msgstr "" +msgstr "Tentang" #: ../invest-applet/invest/applet.py:28 msgid "Help" -msgstr "" +msgstr "Bantuan" #: ../invest-applet/invest/applet.py:29 msgid "Preferences" -msgstr "" +msgstr "Preferensi" #: ../invest-applet/invest/applet.py:30 msgid "Refresh" -msgstr "" +msgstr "Perbarui" #. a) We aren't configured yet #: ../invest-applet/invest/applet.py:62 @@ -2331,31 +2332,31 @@ msgstr "Kertas Catatan MATE" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:1 msgid "Name of timer" -msgstr "" +msgstr "Nama timer" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:2 msgid "Duration of timer in seconds" -msgstr "" +msgstr "Durasi timer dalam detik" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:3 msgid "Show notification popup when timer finish" -msgstr "" +msgstr "Tampilkan popup notifikasi ketika timer selesai" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:4 msgid "Show dialog window when timer finish" -msgstr "" +msgstr "Tampilkan jendela dialog ketika timer selesai" #: ../timerapplet/timerapplet.c:77 msgid "_Start timer" -msgstr "" +msgstr "_Mulai timer" #: ../timerapplet/timerapplet.c:78 msgid "P_ause timer" -msgstr "" +msgstr "Timer berh_enti" #: ../timerapplet/timerapplet.c:79 msgid "S_top timer" -msgstr "" +msgstr "Hen_tikan timer" #: ../timerapplet/timerapplet.c:139 msgid "Finished" @@ -2363,7 +2364,7 @@ msgstr "Selesai" #: ../timerapplet/timerapplet.c:146 ../timerapplet/timerapplet.c:158 msgid "Timer finished!" -msgstr "" +msgstr "Timer selesai!" #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" @@ -2371,31 +2372,31 @@ msgstr "Memulai pewaktu dan menerima notifikasi ketika sudah selesai" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" -msgstr "" +msgstr "Preferensi Applet Timer" #: ../timerapplet/timerapplet.c:298 msgid "Name:" -msgstr "" +msgstr "Nama:" #: ../timerapplet/timerapplet.c:310 msgid "Hours:" -msgstr "" +msgstr "Jam:" #: ../timerapplet/timerapplet.c:324 msgid "Minutes:" -msgstr "" +msgstr "Menit:" #: ../timerapplet/timerapplet.c:338 msgid "Seconds:" -msgstr "" +msgstr "Detik:" #: ../timerapplet/timerapplet.c:352 msgid "Show notification popup" -msgstr "" +msgstr "Tampilkan notifikasi popup" #: ../timerapplet/timerapplet.c:358 msgid "Show dialog" -msgstr "" +msgstr "Tampilkan dialog" #: ../timerapplet/timerapplet.c:376 msgid "Timer Applet" @@ -7,13 +7,14 @@ # Rahul Bhalerao <[email protected]>, 2006 # Sandeep Shedmake <[email protected]>, 2008, 2009 # sandeeps <[email protected]>, 2009 +# Vaibhav S Dalvi <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-03 18:03+0000\n" -"Last-Translator: Stefano Karapetsas <[email protected]>\n" +"PO-Revision-Date: 2014-06-18 18:31+0000\n" +"Last-Translator: Vaibhav S Dalvi <[email protected]>\n" "Language-Team: Marathi (http://www.transifex.com/projects/p/MATE/language/mr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -290,7 +291,7 @@ msgstr "ही उपयुक्तता तुमच्या लॅपटॉ #. ture #: ../battstat/battstat_applet.c:1425 msgid "upower backend enabled." -msgstr "" +msgstr "upower बॅकेंड कार्यान्वीत." #. true #: ../battstat/battstat_applet.c:1427 @@ -463,11 +464,11 @@ msgstr "लेबल नको साठी 0, टक्केवारीसा #: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:19 msgid "Disable HAL" -msgstr "" +msgstr "HAL अकार्यान्वीत करा" #: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:20 msgid "Disable HAL if true" -msgstr "" +msgstr "जर बरोबर असेल तर HAL अकार्यान्वीत करा" #. TRANSLATOR: this is a selectable item in a drop-down menu to end #. * this sentence: @@ -618,48 +619,48 @@ msgstr "अक्षर पटल आवडी" #: ../command/command.c:110 msgid "Shows the output of a command" -msgstr "" +msgstr "आज्ञेचा प्रतिसाद दाखवते" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "आदेश एप्लेट आवड निवड" #: ../command/command.c:139 msgid "Command:" -msgstr "" +msgstr "आदेश:" #: ../command/command.c:150 msgid "Interval (seconds):" -msgstr "" +msgstr "अंतराळ (सेकंदांत):" #: ../command/command.c:161 #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:5 msgid "Show icon" -msgstr "" +msgstr "चिन्ह दर्शवा" #: ../command/command.c:297 msgid "Command Applet" -msgstr "" +msgstr "आदेश एप्लेट" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1 msgid "Command to execute" -msgstr "" +msgstr "चालवण्याजोगा आदेश" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2 msgid "Command/script to execute to get the output" -msgstr "" +msgstr "आउटपुट मिळण्यासाठी चालवण्याजोगी आदेश/स्क्रिप्ट " #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:3 msgid "Interval for the command" -msgstr "" +msgstr "आदेशासाठी अंतराळ" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:4 msgid "Interval to execute the command (in seconds)" -msgstr "" +msgstr "आदेश चालवण्यास अंतराळ (सेकंदात)" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:6 msgid "If applet icon is shown or not" -msgstr "" +msgstr "अॅप्लेट चिन्ह दाखवलेले आहे का नाही" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" @@ -762,7 +763,7 @@ msgstr "(आरोहित नाही)" #: ../drivemount/drive-button.c:614 msgid "Cannot execute Caja" -msgstr "" +msgstr "Caja चालवू शकत नाही" #: ../drivemount/drive-button.c:616 #, c-format @@ -1159,7 +1160,7 @@ msgstr "पत्ता(_d):" #. setup show-notifications button #: ../mateweather/mateweather-pref.c:1038 msgid "Show _notifications" -msgstr "" +msgstr "सूचना दर्शवा(_N)" #: ../mateweather/mateweather-pref.c:1048 msgid "Update" @@ -1195,7 +1196,7 @@ msgstr "स्थान" #: ../mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in.h:1 msgid "Mateweather Applet Factory" -msgstr "" +msgstr "मेट हवामान एप्लेट फॅक्टरी" #: ../mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in.h:2 msgid "Factory for creating the weather applet." @@ -1207,31 +1208,31 @@ msgstr "सद्य हवामान स्थिती आणि अंद� #: ../invest-applet/data/financialchart.ui.h:1 msgid "Today" -msgstr "" +msgstr "आज" #: ../invest-applet/data/financialchart.ui.h:2 msgid "5 Days" -msgstr "" +msgstr "5 दिवस" #: ../invest-applet/data/financialchart.ui.h:3 msgid "3 Months" -msgstr "" +msgstr "3 महिने" #: ../invest-applet/data/financialchart.ui.h:4 msgid "6 Months" -msgstr "" +msgstr "6 महिने" #: ../invest-applet/data/financialchart.ui.h:5 msgid "1 Year" -msgstr "" +msgstr "1 वर्ष" #: ../invest-applet/data/financialchart.ui.h:6 msgid "5 Years" -msgstr "" +msgstr "5 वर्षे" #: ../invest-applet/data/financialchart.ui.h:7 msgid "Maximum" -msgstr "" +msgstr "कमाल" #: ../invest-applet/data/financialchart.ui.h:8 #: ../invest-applet/invest/chart.py:111 @@ -1408,7 +1409,7 @@ msgstr "<i><small><b>टिप:</b> Quotes किमान 15 मिनीटं #: ../invest-applet/data/prefs-dialog.ui.h:6 msgid "Currency" -msgstr "" +msgstr "चलन" #: ../invest-applet/invest/about.py:22 msgid "Invest" @@ -1421,19 +1422,19 @@ msgstr "तुमच्या गुंतवलेल्या पैशां� #. name, stock_id, label, accellerator, tooltip, callback #: ../invest-applet/invest/applet.py:27 msgid "About" -msgstr "" +msgstr "विषयी" #: ../invest-applet/invest/applet.py:28 msgid "Help" -msgstr "" +msgstr "मदत" #: ../invest-applet/invest/applet.py:29 msgid "Preferences" -msgstr "" +msgstr "प्राधान्यक्रम" #: ../invest-applet/invest/applet.py:30 msgid "Refresh" -msgstr "" +msgstr "पुन्ह दाखल करा" #. a) We aren't configured yet #: ../invest-applet/invest/applet.py:62 @@ -1493,7 +1494,7 @@ msgstr "दलाली" #: ../invest-applet/invest/preferences.py:34 msgid "Currency Rate" -msgstr "" +msgstr "चलनी भाव" #: ../invest-applet/invest/quotes.py:136 msgid "Invest could not connect to Yahoo! Finance" @@ -1511,7 +1512,7 @@ msgstr "%s येथे अद्ययावत केले" #: ../invest-applet/invest/quotes.py:158 #, python-format msgid "Average change: %s" -msgstr "" +msgstr "सरासरी बदल: %s" #. Translators: This is share-market jargon. It refers to the total difference #. between the current price and purchase price for all the shares put @@ -1522,7 +1523,7 @@ msgstr "" #: ../invest-applet/invest/quotes.py:167 #, python-format msgid "Positions balance: %s %s (%s)" -msgstr "" +msgstr "पोजीशन्स बॅलन्स: %s %s (%s)" #. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, #. VARIATION_PCT, PB @@ -1938,7 +1939,7 @@ msgstr "बिनतारी संजाळ दुव्याची गुण #: ../null_applet/MATE_KeyboardApplet.server.in.h:1 msgid "Keyboard Indicator (Deprecated)" -msgstr "" +msgstr "कळफलक सूचक (वापरणीत नाही)" #: ../null_applet/MATE_KeyboardApplet.server.in.h:2 msgid "Keyboard layout indicator" @@ -2014,11 +2015,11 @@ msgstr "नविन टीप(_N)" #: ../stickynotes/stickynotes.ui.h:2 msgid "_Delete Note..." -msgstr "" +msgstr "टिप नष्ट करा...(_D)" #: ../stickynotes/stickynotes.ui.h:3 msgid "_Lock Note" -msgstr "" +msgstr "टिप ताळाबंद करा(_L)" #: ../stickynotes/stickynotes.ui.h:5 msgid "Sticky Notes Preferences" @@ -2086,11 +2087,11 @@ msgstr "वर्तन" #: ../stickynotes/stickynotes.ui.h:21 msgid "Hide notes when the des_ktop is clicked on" -msgstr "" +msgstr "डेस्कटाॅपवर क्लिक केल्यावर टीपा लपवा (_K)" #: ../stickynotes/stickynotes.ui.h:22 msgid "Choose whether to hide all notes when selecting on the desktop" -msgstr "" +msgstr "डेस्कटाॅपवर निवडताना सगळ्या टीपा लपवायच्या का दाखवायच्या ते निवडा" #: ../stickynotes/stickynotes.ui.h:23 msgid "Force _default color and font on notes" @@ -2295,13 +2296,13 @@ msgstr "जर हा पर्याय कार्यान्वीत क� #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:23 msgid "Whether to hide all notes when the desktop is selected" -msgstr "" +msgstr "डेस्कटाॅपवर निवडल्यावर सगळ्या टीपा लपवायच्या का दाखवायच्या" #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:24 msgid "" "If this option is enabled, selecting the desktop in any way will " "automatically hide all the open notes." -msgstr "" +msgstr "जर हा पर्याय कार्यान्वित असेल तर डेस्कटाॅपवर क्लिक केल्यावर सर्व उघड्या टीपा लपविल्या जातील" #: ../stickynotes/org.mate.stickynotes.gschema.xml.in.in.h:25 msgid "Whether to ask for confirmation when deleting a note" @@ -2340,75 +2341,75 @@ msgstr "MATE डेस्कटॉप पर्यावरणासाठी � #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:1 msgid "Name of timer" -msgstr "" +msgstr "गजराचे नाव" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:2 msgid "Duration of timer in seconds" -msgstr "" +msgstr "गजराची वेळ (सेकंदात)" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:3 msgid "Show notification popup when timer finish" -msgstr "" +msgstr "गजर संपल्यावर संदेश पॉप-अप दाखवा " #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:4 msgid "Show dialog window when timer finish" -msgstr "" +msgstr "गजर संपल्यावर संवाद चौकट दाखवा " #: ../timerapplet/timerapplet.c:77 msgid "_Start timer" -msgstr "" +msgstr "गजर सुरू करा (_S)" #: ../timerapplet/timerapplet.c:78 msgid "P_ause timer" -msgstr "" +msgstr "गजर तात्पुरता थांबवा (_P)" #: ../timerapplet/timerapplet.c:79 msgid "S_top timer" -msgstr "" +msgstr "गजर थांबवा (_T)" #: ../timerapplet/timerapplet.c:139 msgid "Finished" -msgstr "" +msgstr "संपला" #: ../timerapplet/timerapplet.c:146 ../timerapplet/timerapplet.c:158 msgid "Timer finished!" -msgstr "" +msgstr "गजर संपला" #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" -msgstr "" +msgstr "एक टायमर सुरु करा आणि तो संपल्यावर खबर मिळू द्या" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" -msgstr "" +msgstr "गजर एप्लेट आवड निवड" #: ../timerapplet/timerapplet.c:298 msgid "Name:" -msgstr "" +msgstr "नाव:" #: ../timerapplet/timerapplet.c:310 msgid "Hours:" -msgstr "" +msgstr "तास:" #: ../timerapplet/timerapplet.c:324 msgid "Minutes:" -msgstr "" +msgstr "मिनिटे:" #: ../timerapplet/timerapplet.c:338 msgid "Seconds:" -msgstr "" +msgstr "सेंकद:" #: ../timerapplet/timerapplet.c:352 msgid "Show notification popup" -msgstr "" +msgstr "सूचना पॉप-अप दर्शवा" #: ../timerapplet/timerapplet.c:358 msgid "Show dialog" -msgstr "" +msgstr "संवाद दाखवा" #: ../timerapplet/timerapplet.c:376 msgid "Timer Applet" -msgstr "" +msgstr "टायमर एप्लेट" #: ../trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in.h:1 msgid "Trash" @@ -3,17 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Carlos <[email protected]>, 2013 -# Carlos <[email protected]>, 2012-2013 -# Carlos <[email protected]>, 2014 +# Carlos Moreira <[email protected]>, 2013 +# Carlos Moreira <[email protected]>, 2012-2013 +# Carlos Moreira <[email protected]>, 2014 +# Gonçalo Silva <[email protected]>, 2014 # Sérgio Marques <[email protected]>, 2012 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-03 18:03+0000\n" -"Last-Translator: Stefano Karapetsas <[email protected]>\n" +"PO-Revision-Date: 2014-05-24 11:23+0000\n" +"Last-Translator: Carlos Moreira <[email protected]>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/MATE/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -622,7 +623,7 @@ msgstr "Mostra a saída de um comando" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "Preferências da Applet de Comandos" #: ../command/command.c:139 msgid "Command:" @@ -639,7 +640,7 @@ msgstr "Mostrar ícone" #: ../command/command.c:297 msgid "Command Applet" -msgstr "" +msgstr "Applet de Comandos" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1 msgid "Command to execute" @@ -647,19 +648,19 @@ msgstr "Comando a executar" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2 msgid "Command/script to execute to get the output" -msgstr "" +msgstr "Comando/script a executar para conseguir o resultado" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:3 msgid "Interval for the command" -msgstr "" +msgstr "Intervalo do comando" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:4 msgid "Interval to execute the command (in seconds)" -msgstr "" +msgstr "Intervalo para executar o comando (em segundos)" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:6 msgid "If applet icon is shown or not" -msgstr "" +msgstr "Se o ícone do applet é mostrado ou não" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" @@ -1159,7 +1160,7 @@ msgstr "En_dereço:" #. setup show-notifications button #: ../mateweather/mateweather-pref.c:1038 msgid "Show _notifications" -msgstr "" +msgstr "Mostrar _notificações" #: ../mateweather/mateweather-pref.c:1048 msgid "Update" @@ -2340,31 +2341,31 @@ msgstr "Notas Pegajosas para o Ambiente de Trabalho MATE" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:1 msgid "Name of timer" -msgstr "" +msgstr "Nome do temporizador" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:2 msgid "Duration of timer in seconds" -msgstr "" +msgstr "Duração do temporizador em segundos" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:3 msgid "Show notification popup when timer finish" -msgstr "" +msgstr "Mostrar alerta de notificação quando o temporizador terminar" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:4 msgid "Show dialog window when timer finish" -msgstr "" +msgstr "Mostrar janela de diálogo ao terminar o temporizador" #: ../timerapplet/timerapplet.c:77 msgid "_Start timer" -msgstr "" +msgstr "_Iniciar temporizador" #: ../timerapplet/timerapplet.c:78 msgid "P_ause timer" -msgstr "" +msgstr "P_ausar temporizador" #: ../timerapplet/timerapplet.c:79 msgid "S_top timer" -msgstr "" +msgstr "Parar temporizador" #: ../timerapplet/timerapplet.c:139 msgid "Finished" @@ -2372,7 +2373,7 @@ msgstr "Terminado" #: ../timerapplet/timerapplet.c:146 ../timerapplet/timerapplet.c:158 msgid "Timer finished!" -msgstr "" +msgstr "O temporizador terminou!" #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" @@ -2380,31 +2381,31 @@ msgstr "Iniciar um temporizador e receber uma notificação quando terminar" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" -msgstr "" +msgstr "Preferências da applet Temporizador" #: ../timerapplet/timerapplet.c:298 msgid "Name:" -msgstr "" +msgstr "Nome:" #: ../timerapplet/timerapplet.c:310 msgid "Hours:" -msgstr "" +msgstr "Horas:" #: ../timerapplet/timerapplet.c:324 msgid "Minutes:" -msgstr "" +msgstr "Minutos:" #: ../timerapplet/timerapplet.c:338 msgid "Seconds:" -msgstr "" +msgstr "Segundos:" #: ../timerapplet/timerapplet.c:352 msgid "Show notification popup" -msgstr "" +msgstr "Mostrar aviso de notificação" #: ../timerapplet/timerapplet.c:358 msgid "Show dialog" -msgstr "" +msgstr "Mostrar diálogo" #: ../timerapplet/timerapplet.c:376 msgid "Timer Applet" diff --git a/po/pt_BR.po b/po/pt_BR.po index 80d7bb9b..5edf0610 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,23 +7,26 @@ # Andre Gondim <[email protected]>, 2009 # Evandro Fernandes Giovanini <[email protected]>, 2006 # Fábio Nogueira <[email protected]>, 2008 -# Fabrício Godoy <[email protected]>, 2008 +# skarllotbr <[email protected]>, 2008 +# Fabrizzio Alphonsus Soares <[email protected]>, 2012 # Fabrizzio Alphonsus Soares <[email protected]>, 2012 # Gustavo Noronha Silva <[email protected]>, 2003 # Henrique P. Machado <[email protected]>, 2008 # Krix Apolinário <[email protected]>, 2009 -# Pygmalion, 2014 -# Pygmalion, 2014 -# mkbu95 <[email protected]>, 2013 +# Marcus Vinícius Marques, 2014 +# Marcus Vinícius Marques, 2014 +# Matheus Macabu <[email protected]>, 2013 +# Matheus Macabu <[email protected]>, 2013 # Og Maciel <[email protected]>, 2007 -# Vladimir Melo <[email protected]>, 2008, 2009 +# Pygmalion, 2014 +# Vladimir Melo <[email protected]>, 2008-2009 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-18 23:52+0000\n" -"Last-Translator: Pygmalion\n" +"PO-Revision-Date: 2014-05-10 20:44+0000\n" +"Last-Translator: Marcio Andre Padula <[email protected]>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/MATE/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -300,7 +303,7 @@ msgstr "Este utilitário mostra o estado da bateria do seu laptop." #. ture #: ../battstat/battstat_applet.c:1425 msgid "upower backend enabled." -msgstr "" +msgstr "Formatar o Dispositivo" #. true #: ../battstat/battstat_applet.c:1427 @@ -632,7 +635,7 @@ msgstr "Exibe a saída de um comando" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "Preferências de comando Applet" #: ../command/command.c:139 msgid "Command:" @@ -649,7 +652,7 @@ msgstr "Exibir ícone" #: ../command/command.c:297 msgid "Command Applet" -msgstr "" +msgstr "Comando Applet" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1 msgid "Command to execute" @@ -657,7 +660,7 @@ msgstr "Comando a executar" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2 msgid "Command/script to execute to get the output" -msgstr "" +msgstr "Comando/script para executar para obter resultado" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:3 msgid "Interval for the command" @@ -772,7 +775,7 @@ msgstr "(desmontado)" #: ../drivemount/drive-button.c:614 msgid "Cannot execute Caja" -msgstr "" +msgstr "Não é possível executar Caja" #: ../drivemount/drive-button.c:616 #, c-format @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alexander <[email protected]>, 2014 # Alexander Ovcharenko <[email protected]>, 2003 # Alexander Sokolov <[email protected]>, 2012 # Alexandre Prokhudine, 2002 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-15 18:37+0000\n" -"Last-Translator: Alexei Sorokin <[email protected]>\n" +"PO-Revision-Date: 2014-05-31 12:01+0000\n" +"Last-Translator: Alexander <[email protected]>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/MATE/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,11 +113,11 @@ msgstr "Ошибка: %s" #: ../accessx-status/applet.c:1386 #: ../accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in.h:3 msgid "Keyboard Accessibility Status" -msgstr "Состояние специальных возможностей клавиатуры" +msgstr "Кнопка специальных возможностей клавиатуры" #: ../accessx-status/applet.c:1390 msgid "Displays current state of keyboard accessibility features" -msgstr "Отображает текущее состояние специальных возможностей клавиатуры" +msgstr "Кнопка вызова настроек специальных возможностей клавиатуры" #: ../accessx-status/org.mate.applets.AccessxStatusApplet.mate-panel-applet.in.in.h:1 msgid "AccessX Status Applet Factory" @@ -834,7 +835,7 @@ msgstr "Подключает локальные диски и устройств #: ../geyes/geyes.c:196 msgid "A goofy set of eyes for the MATE panel. They follow your mouse." -msgstr "Бестолковые глаза для панели MATE, следящие за курсором мыши." +msgstr "Глаза для панели MATE, следящие за курсором мыши." #: ../geyes/geyes.c:405 ../geyes/geyes.c:438 ../geyes/geyes.c:440 #: ../geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in.h:2 @@ -859,7 +860,7 @@ msgstr "Каталог, где расположены темы" #: ../geyes/themes.c:130 msgid "Can not launch the eyes applet." -msgstr "Не удалось запустить апплет глазок." +msgstr "Не удалось запустить апплет \"Глазки\"." #: ../geyes/themes.c:131 msgid "There was a fatal error while trying to load the theme." @@ -879,7 +880,7 @@ msgstr "_Выберите тему:" #: ../mateweather/mateweather-about.c:48 msgid "© 1999-2005 by S. Papadimitriou and others" -msgstr "© 1999 S. Papadimitriou и другие" +msgstr "© 1999-2005 S. Papadimitriou и другие" #: ../mateweather/mateweather-about.c:49 msgid "A panel application for monitoring local weather conditions." @@ -902,7 +903,7 @@ msgstr "Сводка погоды" #: ../mateweather/mateweather-applet.c:355 #: ../mateweather/mateweather-applet.c:359 msgid "MATE Weather" -msgstr "Апплет «Сводка погоды» для среды Гном" +msgstr "Апплет «Сводка погоды» для среды MATE" #: ../mateweather/mateweather-applet.c:459 msgid "Weather Forecast" @@ -2392,7 +2393,7 @@ msgstr "Таймер завершён!" #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" -msgstr "Выставить таймер и получить уведомление после окончания" +msgstr "Таймер обратного отсчёта с уведомлением после окончания" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" @@ -4,19 +4,19 @@ # # Translators: # Ján Ďanovský <[email protected]>, 2013-2014 -# SGOrava <[email protected]>, 2013 +# Juraj Oravec <[email protected]>, 2013 # Marcel Telka <[email protected]>, 2005 -# Michelozzo <[email protected]>, 2013 -# Michelozzo <[email protected]>, 2013 +# Michal Slovák <[email protected]>, 2013 +# Michal Slovák <[email protected]>, 2013 # Peter Tuharsky <[email protected]>, 2007-2008 -# SGOrava <[email protected]>, 2013 -# tibbi <[email protected]>, 2014 +# Juraj Oravec <[email protected]>, 2013 +# Tibor Kaputa <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-16 23:45+0000\n" +"PO-Revision-Date: 2014-05-14 17:54+0000\n" "Last-Translator: Ján Ďanovský <[email protected]>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/MATE/language/sk/)\n" "MIME-Version: 1.0\n" @@ -53,11 +53,11 @@ msgstr "Pri spúšťaní prehliadača pomocníka nastala chyba: %s" #: ../accessx-status/applet.c:204 #, c-format msgid "There was an error launching the keyboard preferences dialog: %s" -msgstr "Vyskytla sa chyba pri spúšťaní dialógového okna predvolieb klávesnice: %s" +msgstr "Vyskytla sa chyba pri spúšťaní dialógového okna nastavení klávesnice: %s" #: ../accessx-status/applet.c:217 msgid "_Keyboard Accessibility Preferences" -msgstr "Predvoľby prístupnosti _klávesnice" +msgstr "Nastavenia prístupnosti _klávesnice" #: ../accessx-status/applet.c:218 ../battstat/battstat_applet.c:64 #: ../charpick/charpick.c:681 ../cpufreq/src/cpufreq-applet.c:139 @@ -133,7 +133,7 @@ msgstr "Zobrazí stav funkcií pre sprístupnenie klávesnice" #: ../multiload/main.c:445 ../stickynotes/stickynotes_applet.c:42 #: ../timerapplet/timerapplet.c:80 msgid "_Preferences" -msgstr "_Predvoľby" +msgstr "_Nastavenia" #: ../battstat/battstat_applet.c:72 msgid "System is running on AC power" @@ -325,7 +325,7 @@ msgstr "Sledovanie zostávajúcej kapacity batérie notebooku" #: ../battstat/battstat_applet.ui.h:1 msgid "Battery Charge Monitor Preferences" -msgstr "Predvoľby Sledovania stavu batérie" +msgstr "Nastavenia sledovania stavu batérie" #: ../battstat/battstat_applet.ui.h:2 msgid "Appearance" @@ -674,7 +674,7 @@ msgstr "Či je ikona apletu zobrazená alebo nie" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" -msgstr "Predvoľby sledovania frekvencie procesora" +msgstr "Nastavenia sledovania frekvencie procesora" #: ../cpufreq/cpufreq-preferences.ui.h:2 msgid "Monitor Settings" @@ -1041,7 +1041,7 @@ msgstr "Zlyhalo načítanie XML databázy umiestnení. Prosím, oznámte toto ak #: ../mateweather/mateweather-pref.c:824 msgid "Weather Preferences" -msgstr "Predvoľby Počasia" +msgstr "Nastavenia počasia" #: ../mateweather/mateweather-pref.c:854 #: ../mateweather/mateweather-pref.c:1052 @@ -1401,7 +1401,7 @@ msgstr "Sťahuje sa graf z<b>Yahoo!</b>" #: ../invest-applet/data/prefs-dialog.ui.h:1 msgid "Invest Preferences" -msgstr "Predvoľby Invest" +msgstr "Nastavenia Invest" #: ../invest-applet/data/prefs-dialog.ui.h:2 msgid "label" @@ -1914,7 +1914,7 @@ msgstr "_Zápis" #: ../multiload/properties.c:631 msgid "System Monitor Preferences" -msgstr "Predvoľby Sledovania Systému" +msgstr "Nastavenia sledovania systému" #: ../null_applet/MATE_CDPlayerApplet.server.in.h:1 msgid "CD Player (Deprecated)" @@ -2034,7 +2034,7 @@ msgstr "_Zamknúť poznámku" #: ../stickynotes/stickynotes.ui.h:5 msgid "Sticky Notes Preferences" -msgstr "Predvoľby Poznámok" +msgstr "Nastavenia poznámok" #: ../stickynotes/stickynotes.ui.h:6 msgid "Default Note Properties" diff --git a/po/zh_CN.po b/po/zh_CN.po index d41fc0df..3bd113f0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ # Liu Songhe <[email protected]>, 2003 # Wang Li <[email protected]>, 2002 # Wu XiaoGuang <[email protected]>, 2002 -# Wylmer Wang <[email protected]>, 2013 +# Wylmer Wang <[email protected]>, 2013-2014 # Xiong Jiang <[email protected]>, 2003 # YunQiang Su <[email protected]>, 2010 # 甘 露 <[email protected]>, 2009 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: MATE Desktop Environment\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-03 18:28+0100\n" -"PO-Revision-Date: 2014-02-03 18:03+0000\n" -"Last-Translator: Stefano Karapetsas <[email protected]>\n" +"PO-Revision-Date: 2014-03-06 09:40+0000\n" +"Last-Translator: Wylmer Wang <[email protected]>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/MATE/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -461,11 +461,11 @@ msgstr "0 代表无标签，1 代表百分比，2 代表剩余时间" #: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:19 msgid "Disable HAL" -msgstr "" +msgstr "禁用 HAL" #: ../battstat/org.mate.panel.applet.battstat.gschema.xml.in.in.h:20 msgid "Disable HAL if true" -msgstr "" +msgstr "为 true 时禁用 HAL" #. TRANSLATOR: this is a selectable item in a drop-down menu to end #. * this sentence: @@ -616,48 +616,48 @@ msgstr "字符板首选项" #: ../command/command.c:110 msgid "Shows the output of a command" -msgstr "" +msgstr "显示命令输出" #: ../command/command.c:127 msgid "Command Applet Preferences" -msgstr "" +msgstr "命令小程序首选项" #: ../command/command.c:139 msgid "Command:" -msgstr "" +msgstr "命令：" #: ../command/command.c:150 msgid "Interval (seconds):" -msgstr "" +msgstr "间隔(秒)：" #: ../command/command.c:161 #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:5 msgid "Show icon" -msgstr "" +msgstr "显示图标" #: ../command/command.c:297 msgid "Command Applet" -msgstr "" +msgstr "命令小程序" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:1 msgid "Command to execute" -msgstr "" +msgstr "要执行的命令" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:2 msgid "Command/script to execute to get the output" -msgstr "" +msgstr "获取输出所执行的命令/脚本" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:3 msgid "Interval for the command" -msgstr "" +msgstr "命令间隔" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:4 msgid "Interval to execute the command (in seconds)" -msgstr "" +msgstr "执行命令的间隔(秒:)" #: ../command/org.mate.panel.applet.command.gschema.xml.in.in.h:6 msgid "If applet icon is shown or not" -msgstr "" +msgstr "是否显示小程序图标" #: ../cpufreq/cpufreq-preferences.ui.h:1 msgid "CPU Frequency Monitor Preferences" @@ -760,7 +760,7 @@ msgstr "(未挂载)" #: ../drivemount/drive-button.c:614 msgid "Cannot execute Caja" -msgstr "" +msgstr "无法执行 Caja" #: ../drivemount/drive-button.c:616 #, c-format @@ -1157,7 +1157,7 @@ msgstr "地址(_D)：" #. setup show-notifications button #: ../mateweather/mateweather-pref.c:1038 msgid "Show _notifications" -msgstr "" +msgstr "显示通知:(_N)" #: ../mateweather/mateweather-pref.c:1048 msgid "Update" @@ -1419,19 +1419,19 @@ msgstr "跟踪您的投资。" #. name, stock_id, label, accellerator, tooltip, callback #: ../invest-applet/invest/applet.py:27 msgid "About" -msgstr "" +msgstr "关于" #: ../invest-applet/invest/applet.py:28 msgid "Help" -msgstr "" +msgstr "帮助" #: ../invest-applet/invest/applet.py:29 msgid "Preferences" -msgstr "" +msgstr "首选项" #: ../invest-applet/invest/applet.py:30 msgid "Refresh" -msgstr "" +msgstr "刷新" #. a) We aren't configured yet #: ../invest-applet/invest/applet.py:62 @@ -2336,31 +2336,31 @@ msgstr "用于 MATE 桌面环境的置顶便笺" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:1 msgid "Name of timer" -msgstr "" +msgstr "定时器名称" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:2 msgid "Duration of timer in seconds" -msgstr "" +msgstr "定时长度(秒)" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:3 msgid "Show notification popup when timer finish" -msgstr "" +msgstr "时间到的时候显示弹出通知" #: ../timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in.h:4 msgid "Show dialog window when timer finish" -msgstr "" +msgstr "时间到的时候显示对话框窗口" #: ../timerapplet/timerapplet.c:77 msgid "_Start timer" -msgstr "" +msgstr "启动定时器(_S)" #: ../timerapplet/timerapplet.c:78 msgid "P_ause timer" -msgstr "" +msgstr "暂停计时:(_A)" #: ../timerapplet/timerapplet.c:79 msgid "S_top timer" -msgstr "" +msgstr "停止计时(_S)" #: ../timerapplet/timerapplet.c:139 msgid "Finished" @@ -2368,7 +2368,7 @@ msgstr "已完成" #: ../timerapplet/timerapplet.c:146 ../timerapplet/timerapplet.c:158 msgid "Timer finished!" -msgstr "" +msgstr "时间到！" #: ../timerapplet/timerapplet.c:253 msgid "Start a timer and receive a notification when it is finished" @@ -2376,31 +2376,31 @@ msgstr "开始计时并在结束时收到通知" #: ../timerapplet/timerapplet.c:286 msgid "Timer Applet Preferences" -msgstr "" +msgstr "定时器小程序首选项" #: ../timerapplet/timerapplet.c:298 msgid "Name:" -msgstr "" +msgstr "名称：" #: ../timerapplet/timerapplet.c:310 msgid "Hours:" -msgstr "" +msgstr "小时：" #: ../timerapplet/timerapplet.c:324 msgid "Minutes:" -msgstr "" +msgstr "分钟：" #: ../timerapplet/timerapplet.c:338 msgid "Seconds:" -msgstr "" +msgstr "秒：" #: ../timerapplet/timerapplet.c:352 msgid "Show notification popup" -msgstr "" +msgstr "显示弹出通知" #: ../timerapplet/timerapplet.c:358 msgid "Show dialog" -msgstr "" +msgstr "显示对话框" #: ../timerapplet/timerapplet.c:376 msgid "Timer Applet" diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index df6f8292..2b10fd29 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = pixmaps docs data +SUBDIRS = pixmaps docs ui_files = stickynotes-applet-menu.xml builder_files = stickynotes.ui @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ -I$(srcdir) \ $(STICKYNOTES_CFLAGS) \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(LIBWNCK_CFLAGS) \ $(XML2_CFLAGS) \ -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\ @@ -36,13 +37,14 @@ stickynotes_applet_SOURCES = \ stickynotes_applet_LDADD = \ $(STICKYNOTES_LIBS) \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(LIBWNCK_LIBS) \ $(XML2_LIBS) \ -lX11 builder_DATA = $(builder_files) -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = $(ui_files) @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/stickynotes/data/MATE_StickyNotesApplet.server.in b/stickynotes/data/MATE_StickyNotesApplet.server.in deleted file mode 100644 index a96cce74..00000000 --- a/stickynotes/data/MATE_StickyNotesApplet.server.in +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0"?> -<!-- This file was installed to automatically upgrade your machine from using - stickynotes to using Tomboy. - - If you wish to continue using stickynotes, please recompile MATE-Applets - with -enable-stickynotes and your stickynotes applets should reappear. ---> - -<oaf_info> - <oaf_server iid="OAFIID:MATE_StickyNotesApplet" type="factory" location="OAFIID:TomboyApplet_Factory"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/> - <item value="IDL:MateComponent/Control:1.0"/> - <item value="IDL:MateComponent/Unknown:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" _value="Tomboy (ne Stickynotes)"/> - <oaf_attribute name="description" type="string" _value="Tomboy (transparent upgrade from stickynotes)"/> - <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/> - <oaf_attribute name="bugzilla:product" type="string" value="mate-applets"/> - <oaf_attribute name="bugzilla:component" type="string" value="stickynotes"/> - <oaf_attribute name="bugzilla:other_binaries" type="string" value="stickynotes_applet"/> - </oaf_server> -</oaf_info> - diff --git a/stickynotes/data/Makefile.am b/stickynotes/data/Makefile.am deleted file mode 100644 index 194d08f9..00000000 --- a/stickynotes/data/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# install the upgrading .server file -# - -server_in_files = \ - MATE_StickyNotesApplet.server.in - -if BUILD_STICKYNOTES_APPLET -else -serverdir = $(libdir)/matecomponent/servers -server_DATA = $(server_in_files:.server.in=.server) - -@INTLTOOL_SERVER_RULE@ - -CLEANFILES = $(server_DATA) - -endif -EXTRA_DIST = $(server_in_files) - --include $(top_srcdir)/git.mk diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index d4e82ace..2a2cad17 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -54,12 +54,7 @@ set_icon_geometry (GdkWindow *window, int height) { gulong data[4]; -#if GTK_CHECK_VERSION (3, 0, 0) Display *dpy = gdk_x11_display_get_xdisplay (gdk_window_get_display (window)); -#else - Display *dpy = gdk_x11_drawable_get_xdisplay (window); -#endif - data[0] = x; data[1] = y; data[2] = width; @@ -68,11 +63,7 @@ set_icon_geometry (GdkWindow *window, XChangeProperty (dpy, GDK_WINDOW_XID (window), gdk_x11_get_xatom_by_name_for_display ( -#if GTK_CHECK_VERSION (3, 0, 0) gdk_window_get_display (window), -#else - gdk_drawable_get_display (window), -#endif "_NET_WM_ICON_GEOMETRY"), XA_CARDINAL, 32, PropModeReplace, (guchar *)&data, 4); @@ -838,11 +829,7 @@ stickynotes_save_now (void) /* The XML file is $HOME/.config/mate/stickynotes-applet, most probably */ { - #if GLIB_CHECK_VERSION(2, 6, 0) gchar* file = g_build_filename(g_get_user_config_dir(), "mate", "stickynotes-applet.xml", NULL); - #else // glib version < 2.6.0 - gchar* file = g_build_filename(g_get_home_dir(), ".config", "mate", "stickynotes-applet.xml", NULL); - #endif xmlSaveFormatFile(file, doc, 1); @@ -879,12 +866,7 @@ stickynotes_load (GdkScreen *screen) int x, y, w, h; /* The XML file is $HOME/.config/mate/stickynotes-applet, most probably */ { - /* retro-compatibilidad con ~/.mate2/ */ - #if GLIB_CHECK_VERSION(2, 6, 0) gchar* file = g_build_filename(g_get_user_config_dir(), "mate", "stickynotes-applet.xml", NULL); - #else // glib version < 2.6.0 - gchar* file = g_build_filename(g_get_home_dir(), ".config", "mate", "stickynotes-applet.xml", NULL); - #endif if (g_file_test(file, G_FILE_TEST_EXISTS)) { diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c index 980b9a10..038509eb 100644 --- a/stickynotes/stickynotes_applet_callbacks.c +++ b/stickynotes/stickynotes_applet_callbacks.c @@ -27,6 +27,7 @@ #endif #include <X11/Xatom.h> #include <gdk/gdkx.h> +#include <libmate-desktop/mate-aboutdialog.h> static gboolean get_desktop_window (Window *window) { @@ -167,14 +168,9 @@ void install_check_click_on_desktop (void) return; } -#if GTK_CHECK_VERSION (3, 0, 0) /* Access the desktop window. desktop_window is the root window for the * default screen, so we know using gdk_display_get_default() is correct. */ window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), desktop_window); -#else - /* Access the desktop window */ - window = gdk_window_foreign_new (desktop_window); -#endif /* It may contain an atom to tell us which other window to monitor */ user_time_window = gdk_x11_get_xatom_by_name ("_NET_WM_USER_TIME_WINDOW"); @@ -202,11 +198,7 @@ void install_check_click_on_desktop (void) { /* We have another window to monitor */ desktop_window = *data; -#if GTK_CHECK_VERSION (3, 0, 0) window = gdk_x11_window_foreign_new_for_display (gdk_window_get_display (window), desktop_window); -#else - window = gdk_window_foreign_new (desktop_window); -#endif } } } @@ -432,7 +424,7 @@ menu_about_cb (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "copyright", "\xC2\xA9 2002-2003 Loban A Rahman, " "\xC2\xA9 2005 Davyd Madeley", diff --git a/stickynotes/util.c b/stickynotes/util.c index 6748c7fc..9f395093 100644 --- a/stickynotes/util.c +++ b/stickynotes/util.c @@ -28,10 +28,6 @@ #include <gdk/gdkx.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#define GDK_WINDOW_XWINDOW GDK_WINDOW_XID -#endif - /* Returns the current date in a customizable form, the default * looks like this: "Nov 30, '78" */ gchar * get_current_date(const gchar *format) @@ -92,9 +88,9 @@ xstuff_get_current_workspace (GtkWindow *window) int retval; Display *gdk_display; - root_window = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window ( + root_window = GDK_WINDOW_XID (gdk_screen_get_root_window ( gtk_widget_get_screen (GTK_WIDGET (window)))); - root_window = GDK_WINDOW_XWINDOW (gtk_widget_get_window (GTK_WIDGET (window))); + root_window = GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))); gdk_display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); gdk_error_trap_push (); @@ -129,7 +125,7 @@ xstuff_change_workspace (GtkWindow *window, Screen *screen; gdk_display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - xwindow = GDK_WINDOW_XWINDOW (GDK_WINDOW (gtk_widget_get_window (GTK_WIDGET (window)))); + xwindow = GDK_WINDOW_XID (GDK_WINDOW (gtk_widget_get_window (GTK_WIDGET (window)))); screen = GDK_SCREEN_XSCREEN (gtk_widget_get_screen (GTK_WIDGET (window))); xev.xclient.type = ClientMessage; diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am index 01517ff8..5ace281b 100644 --- a/timerapplet/Makefile.am +++ b/timerapplet/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ -I$(srcdir) \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ @@ -9,7 +10,7 @@ APPLET_LOCATION = $(libexecdir)/timer-applet libexec_PROGRAMS = timer-applet timer_applet_SOURCES = timerapplet.c -timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(LIBNOTIFY_LIBS) +timer_applet_LDADD = $(MATE_APPLETS4_LIBS) $(MATEDESKTOP_LIBS) $(LIBNOTIFY_LIBS) timer_applet_CFLAGS = $(WARN_CFLAGS) appletsdir = $(datadir)/mate-panel/applets diff --git a/timerapplet/timerapplet.c b/timerapplet/timerapplet.c index 05857f74..04596139 100644 --- a/timerapplet/timerapplet.c +++ b/timerapplet/timerapplet.c @@ -29,6 +29,7 @@ #include <gtk/gtk.h> #include <libnotify/notify.h> +#include <libmate-desktop/mate-aboutdialog.h> #include <mate-panel-applet.h> #include <mate-panel-applet-gsettings.h> @@ -246,7 +247,7 @@ timer_about_callback (GtkAction *action, TimerApplet *applet) { const char* authors[] = { "Stefano Karapetsas <[email protected]>", NULL }; - gtk_show_about_dialog(NULL, + mate_show_about_dialog(NULL, "version", VERSION, "copyright", "Copyright © 2014 Stefano Karapetsas", "authors", authors, diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am index ad69c8c8..27160254 100644 --- a/trashapplet/Makefile.am +++ b/trashapplet/Makefile.am @@ -21,7 +21,7 @@ org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = trashapplet-menu.xml builder_DATA = trashapplet-empty-progress.ui diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am index 6e34f837..e24c9233 100644 --- a/trashapplet/src/Makefile.am +++ b/trashapplet/src/Makefile.am @@ -1,7 +1,8 @@ AM_CPPFLAGS = -I$(top_srcdir) \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(GIO_CFLAGS) \ - -DTRASH_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\" + -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\" libexec_PROGRAMS = trashapplet @@ -14,6 +15,7 @@ trashapplet_SOURCES = \ trashapplet_LDADD = \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(GIO_LIBS) \ -lX11 diff --git a/trashapplet/src/trash-empty.c b/trashapplet/src/trash-empty.c index 18a1260a..6505e50c 100644 --- a/trashapplet/src/trash-empty.c +++ b/trashapplet/src/trash-empty.c @@ -125,11 +125,7 @@ trash_empty_update_dialog (gpointer user_data) static gboolean trash_empty_done (gpointer user_data) { -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_destroy (GTK_WIDGET (trash_empty_dialog)); -#else - gtk_object_destroy (GTK_OBJECT (trash_empty_dialog)); -#endif g_assert (trash_empty_dialog == NULL); @@ -264,11 +260,7 @@ trash_empty_start (GtkWidget *parent) g_critical ("failed to parse trash-empty dialog markup"); if (trash_empty_dialog) -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_destroy (GTK_WIDGET (trash_empty_dialog)); -#else - gtk_object_destroy (GTK_OBJECT (trash_empty_dialog)); -#endif g_object_unref (builder); return; @@ -310,11 +302,7 @@ trash_empty_confirmation_response (GtkDialog *dialog, if (response_id == GTK_RESPONSE_YES) trash_empty_start (GTK_WIDGET (dialog)); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_destroy (GTK_WIDGET (dialog)); -#else - gtk_object_destroy (GTK_OBJECT (dialog)); -#endif g_assert (trash_empty_confirm_dialog == NULL); } diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index 53b657d6..be92ca9d 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -34,6 +34,7 @@ #include <gdk/gdkkeysyms-compat.h> #endif #include <gio/gio.h> +#include <libmate-desktop/mate-aboutdialog.h> #include <mate-panel-applet.h> #include "trash-empty.h" @@ -187,11 +188,7 @@ trash_applet_size_allocate (GtkWidget *widget, } static void -#if GTK_CHECK_VERSION (3, 0, 0) trash_applet_dispose (GObject *object) -#else -trash_applet_destroy (GtkObject *object) -#endif { TrashApplet *applet = TRASH_APPLET (object); @@ -211,11 +208,7 @@ trash_applet_destroy (GtkObject *object) g_object_unref (applet->icon); applet->icon = NULL; -#if GTK_CHECK_VERSION (3, 0, 0) G_OBJECT_CLASS (trash_applet_parent_class)->dispose (object); -#else - GTK_OBJECT_CLASS (trash_applet_parent_class)->destroy (object); -#endif } static void @@ -434,7 +427,7 @@ trash_applet_show_about (GtkAction *action, NULL }; - gtk_show_about_dialog (NULL, + mate_show_about_dialog (NULL, "version", VERSION, "copyright", "Copyright \xC2\xA9 2004 Michiel Sikkes," "\xC2\xA9 2008 Ryan Lortie", @@ -529,11 +522,7 @@ confirm_delete_immediately (GtkWidget *parent_view, response = gtk_dialog_run (GTK_DIALOG (dialog)); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_destroy (GTK_WIDGET (dialog)); -#else - gtk_object_destroy (GTK_OBJECT (dialog)); -#endif return response == GTK_RESPONSE_YES; } @@ -608,18 +597,10 @@ trash_applet_drag_data_received (GtkWidget *widget, static void trash_applet_class_init (TrashAppletClass *class) { -#if GTK_CHECK_VERSION (3, 0, 0) GObjectClass *gobject_class = G_OBJECT_CLASS (class); -#else - GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (class); -#endif GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); -#if GTK_CHECK_VERSION (3, 0, 0) gobject_class->dispose = trash_applet_dispose; -#else - gtkobject_class->destroy = trash_applet_destroy; -#endif widget_class->size_allocate = trash_applet_size_allocate; widget_class->button_release_event = trash_applet_button_release; widget_class->key_press_event = trash_applet_key_press; diff --git a/trashapplet/src/xstuff.c b/trashapplet/src/xstuff.c index 75ae8eb3..62f7c6bc 100644 --- a/trashapplet/src/xstuff.c +++ b/trashapplet/src/xstuff.c @@ -24,11 +24,6 @@ #include "xstuff.h" -#if GTK_CHECK_VERSION (3, 0, 0) -#define GDK_WINDOW_XWINDOW(x) GDK_WINDOW_XID(x) -#define gdk_x11_drawable_get_xid(x) GDK_WINDOW_XID(x) -#endif - static Atom panel_atom_get (const char *atom_name) { @@ -162,7 +157,7 @@ xstuff_is_compliant_wm (void) int size; xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); - root_window = GDK_WINDOW_XWINDOW ( + root_window = GDK_WINDOW_XID ( gdk_get_default_root_window ()); /* FIXME this is totally broken; should be using @@ -197,11 +192,11 @@ xstuff_set_no_group (GdkWindow *win) XWMHints wmhints = {0}; XDeleteProperty (GDK_WINDOW_XDISPLAY (win), - GDK_WINDOW_XWINDOW (win), + GDK_WINDOW_XID (win), panel_atom_get ("WM_CLIENT_LEADER")); old_wmhints = XGetWMHints (GDK_WINDOW_XDISPLAY (win), - GDK_WINDOW_XWINDOW (win)); + GDK_WINDOW_XID (win)); /* General paranoia */ if (old_wmhints != NULL) { memcpy (&wmhints, old_wmhints, sizeof (XWMHints)); @@ -217,7 +212,7 @@ xstuff_set_no_group (GdkWindow *win) } XSetWMHints (GDK_WINDOW_XDISPLAY (win), - GDK_WINDOW_XWINDOW (win), + GDK_WINDOW_XID (win), &wmhints); } @@ -250,7 +245,7 @@ xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h) gdk_error_trap_push (); XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), + GDK_WINDOW_XID (window), &size_hints); gdk_window_move_resize (window, x, y, w, h); @@ -278,7 +273,7 @@ xstuff_set_wmspec_dock_hints (GdkWindow *window, } XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), + GDK_WINDOW_XID (window), panel_atom_get ("_NET_WM_WINDOW_TYPE"), XA_ATOM, 32, PropModeReplace, (unsigned char *) atoms, @@ -300,7 +295,7 @@ xstuff_set_wmspec_strut (GdkWindow *window, vals [3] = bottom; XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), + GDK_WINDOW_XID (window), panel_atom_get ("_NET_WM_STRUT"), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) vals, 4); @@ -310,7 +305,7 @@ void xstuff_delete_property (GdkWindow *window, const char *name) { Display *xdisplay = GDK_WINDOW_XDISPLAY (window); - Window xwindow = GDK_WINDOW_XWINDOW (window); + Window xwindow = GDK_WINDOW_XID (window); XDeleteProperty (xdisplay, xwindow, panel_atom_get (name)); @@ -342,7 +337,7 @@ draw_zoom_animation (GdkScreen *gscreen, int depth; dpy = gdk_x11_display_get_xdisplay (gdk_screen_get_display (gscreen)); - root_win = gdk_x11_drawable_get_xid (gdk_screen_get_root_window (gscreen)); + root_win = GDK_WINDOW_XID (gdk_screen_get_root_window (gscreen)); screen = gdk_screen_get_number (gscreen); #if GTK_CHECK_VERSION (3, 0, 0) depth = DefaultDepth(dpy,screen); @@ -495,15 +490,11 @@ xstuff_get_current_workspace (GdkScreen *screen) int result; int retval; - root_window = gdk_x11_drawable_get_xid ( + root_window = GDK_WINDOW_XID ( gdk_screen_get_root_window (screen)); gdk_error_trap_push (); -#if GTK_CHECK_VERSION (3, 0, 0) result = XGetWindowProperty (GDK_SCREEN_XDISPLAY (screen), -#else - result = XGetWindowProperty (gdk_display, -#endif root_window, panel_atom_get ("_NET_CURRENT_DESKTOP"), 0, G_MAXLONG, @@ -545,11 +536,11 @@ xstuff_grab_key_on_all_screens (int keycode, if (grab) XGrabKey (gdk_x11_display_get_xdisplay (display), keycode, modifiers, - gdk_x11_drawable_get_xid (root), + GDK_WINDOW_XID (root), True, GrabModeAsync, GrabModeAsync); else XUngrabKey (gdk_x11_display_get_xdisplay (display), keycode, modifiers, - gdk_x11_drawable_get_xid (root)); + GDK_WINDOW_XID (root)); } } |