[Xfce4-commits] Fix notify plugin build in debug, port tray-provider to xfconf

2013-03-05 Thread Sean Davis 
Updating branch refs/heads/master
 to 07a1a82cc2b1fb3ce3ee092fc3f59ab548b101e4 (commit)
   from 746de8b0ca1d6e1fb7f50a5538591684e0d2a2e2 (commit)

commit 07a1a82cc2b1fb3ce3ee092fc3f59ab548b101e4
Author: Sean Davis 
Date:   Tue Mar 5 20:25:27 2013 -0500

Fix notify plugin build in debug, port tray-provider to xfconf

 src/plugins/notify/notify-provider.c |   10 +++---
 src/plugins/tray/Makefile.am |2 +
 src/plugins/tray/tray-provider.c |   49 +
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/plugins/notify/notify-provider.c 
b/src/plugins/notify/notify-provider.c
index cd6d7fc..183849c 100644
--- a/src/plugins/notify/notify-provider.c
+++ b/src/plugins/notify/notify-provider.c
@@ -84,7 +84,7 @@ notify_playing (NotifyProvider *notify, const ParoleStream 
*stream)
 {
 GdkPixbuf *pix;
 gboolean has_video;
-gchar *title, *album, *artist, *year, *uri;
+gchar *title, *album, *artist, *year, *stream_uri;
 gchar *message;
 ParoleMediaType media_type;
 
@@ -95,17 +95,17 @@ notify_playing (NotifyProvider *notify, const ParoleStream 
*stream)
  "year", &year,
  "has-video", &has_video,
   "media-type", &media_type,   
-  "uri", &uri,  
+  "uri", &stream_uri,  
  NULL);
  
 if ( has_video )
 return;
 
-if ( g_strcmp0(uri, notify->last_played_uri) == 0 )
+if ( g_strcmp0(stream_uri, notify->last_played_uri) == 0 )
 return;
 
-notify->last_played_uri = g_strdup(uri);
-g_free(uri);
+notify->last_played_uri = g_strdup(stream_uri);
+g_free(stream_uri);
 
 if ( !title )
 {
diff --git a/src/plugins/tray/Makefile.am b/src/plugins/tray/Makefile.am
index d7f2fac..fd076c4 100644
--- a/src/plugins/tray/Makefile.am
+++ b/src/plugins/tray/Makefile.am
@@ -20,6 +20,7 @@ tray_icon_la_SOURCES =\
 tray_icon_la_CFLAGS =  \
$(PLATFORM_CFLAGS)  \
$(GTK_CFLAGS)   \
+   $(XFCONF_CFLAGS) \
$(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS)
 
@@ -32,6 +33,7 @@ tray_icon_la_LDFLAGS =\
 tray_icon_la_LIBADD =  \
$(top_builddir)/src/misc/libparole.la   \
$(GTK_LIBS) \
+   $(XFCONF_LIBS)\
$(LIBXFCE4UTIL_LIBS)
 
 #
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 91865e8..a8b6284 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -30,9 +30,9 @@
 #include 
 #include 
 
-#include "tray-provider.h"
+#include 
 
-#define RESOURCE_FILE  "xfce4/src/misc/parole-plugins/tray.rc"
+#include "tray-provider.h"
 
 static void   tray_provider_iface_init(ParoleProviderPluginIface 
*iface);
 static void   tray_provider_finalize   (GObject  *object);
@@ -193,19 +193,18 @@ state_changed_cb (ParoleProviderPlayer *player, const 
ParoleStream *stream, Paro
 static gboolean
 read_entry_bool (const gchar *entry, gboolean fallback)
 {
+XfconfChannel *channel;
 gboolean ret_val = fallback;
-gchar *file;
-XfceRc *rc;
+gchar prop_name[64];
+GValue src = { 0, };
 
-file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, RESOURCE_FILE, 
TRUE);
-rc = xfce_rc_simple_open (file, TRUE);
-g_free (file);
+channel = xfconf_channel_get ("parole");
+g_snprintf (prop_name, sizeof (prop_name), "/plugins/tray/%s", entry);
 
-if ( rc )
-{
-   ret_val = xfce_rc_read_bool_entry (rc, entry, fallback);
-   xfce_rc_close (rc);
-}
+g_value_init(&src, G_TYPE_BOOLEAN);
+
+if (xfconf_channel_get_property (channel, prop_name, &src))
+ret_val = g_value_get_boolean(&src);
 
 return ret_val;
 }
@@ -213,15 +212,17 @@ read_entry_bool (const gchar *entry, gboolean fallback)
 static void
 write_entry_bool (const gchar *entry, gboolean value)
 {
-gchar *file;
-XfceRc *rc;
+XfconfChannel *channel;
+gchar prop_name[64];
+GValue dst = { 0, };
+
+channel = xfconf_channel_get ("parole");
+g_snprintf (prop_name, sizeof (prop_name), "/plugins/tray/%s", entry);
 
-file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, RESOURCE_FILE, 
TRUE);
-rc = xfce_rc_simple_open (file, FALSE);
-g_free (file);
+g_value_init(&dst, G_TYPE_BOOLEAN);
+g_value_set_boolean(&dst, value);
 
-xfce_rc_write_bool_entry (rc, entry, value);
-xfce_rc_close (rc);
+xfconf_channel_set_property (channel, prop_name, &dst);
 }
 
 static void
@@ -229,7 +230,7 @@ hide_on_delete_toggled_cb (GtkWidget *widget, gpointer tray)
 {
 gboolean toggled;
 toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-write_entry_bool ("MINIMIZE_TO_TRAY

[Xfce4-commits] Remove rc file from notify plugin, prevent notification on pause and play.

2013-03-05 Thread Sean Davis 
Updating branch refs/heads/master
 to 746de8b0ca1d6e1fb7f50a5538591684e0d2a2e2 (commit)
   from f00499cdbec047f561d328bbc5d1eebd8b2d11f0 (commit)

commit 746de8b0ca1d6e1fb7f50a5538591684e0d2a2e2
Author: Sean Davis 
Date:   Tue Mar 5 19:01:03 2013 -0500

Remove rc file from notify plugin, prevent notification on pause and play.

 src/plugins/notify/notify-provider.c |   14 ++
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/plugins/notify/notify-provider.c 
b/src/plugins/notify/notify-provider.c
index 3db76f9..cd6d7fc 100644
--- a/src/plugins/notify/notify-provider.c
+++ b/src/plugins/notify/notify-provider.c
@@ -31,8 +31,6 @@
 
 #include "notify-provider.h"
 
-#define RESOURCE_FILE  "xfce4/src/misc/parole-plugins/notify.rc"
-
 static void   notify_provider_iface_init(ParoleProviderPluginIface *iface);
 static void   notify_provider_finalize  (GObject   
*object);
 
@@ -46,6 +44,7 @@ struct _NotifyProvider
 {
 GObject parent;
 ParoleProviderPlayer   *player;
+gchar  *last_played_uri;
 
 NotifyNotification *notification;
 };
@@ -85,7 +84,7 @@ notify_playing (NotifyProvider *notify, const ParoleStream 
*stream)
 {
 GdkPixbuf *pix;
 gboolean has_video;
-gchar *title, *album, *artist, *year;
+gchar *title, *album, *artist, *year, *uri;
 gchar *message;
 ParoleMediaType media_type;
 
@@ -95,11 +94,18 @@ notify_playing (NotifyProvider *notify, const ParoleStream 
*stream)
  "artist", &artist,
  "year", &year,
  "has-video", &has_video,
-  "media-type", &media_type, 
+  "media-type", &media_type,   
+  "uri", &uri,  
  NULL);
  
 if ( has_video )
 return;
+
+if ( g_strcmp0(uri, notify->last_played_uri) == 0 )
+return;
+
+notify->last_played_uri = g_strdup(uri);
+g_free(uri);
 
 if ( !title )
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix configure

2013-03-05 Thread Sean Davis 
Updating branch refs/heads/master
 to f00499cdbec047f561d328bbc5d1eebd8b2d11f0 (commit)
   from 40f1e1d4dee8c8e2e0b8da2c198f946e6e42ade5 (commit)

commit f00499cdbec047f561d328bbc5d1eebd8b2d11f0
Author: Sean Davis 
Date:   Tue Mar 5 19:00:11 2013 -0500

Fix configure

 configure.ac.in |6 ++
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 19f0dd5..7151f9f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -290,10 +290,8 @@ echo "
 
 Plugins to build:
 =
-Notify: ${ac_notify_plugin}"
-
-echo "
-System Tray icon:   ${ac_tray_plugin}" 
+Notify: ${ac_notify_plugin}
+System Tray icon:   ${ac_tray_plugin}
 
 --
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Drop the now-useless power-manager plugin.

2013-03-05 Thread Sean Davis 
Updating branch refs/heads/master
 to 40f1e1d4dee8c8e2e0b8da2c198f946e6e42ade5 (commit)
   from 99548fb13d88e71aff2ad2e86fc47463f2227f16 (commit)

commit 40f1e1d4dee8c8e2e0b8da2c198f946e6e42ade5
Author: Sean Davis 
Date:   Tue Mar 5 18:29:50 2013 -0500

Drop the now-useless power-manager plugin.

 configure.ac.in|   12 -
 po/POTFILES.in |1 -
 src/plugins/Makefile.am|6 +-
 src/plugins/power-manager/Makefile.am  |   49 -
 src/plugins/power-manager/power-manager-plugin.c   |   45 
 src/plugins/power-manager/power-manager-provider.c |  213 
 src/plugins/power-manager/power-manager-provider.h |   44 
 src/plugins/power-manager/power-manager.desktop.in |6 -
 8 files changed, 1 insertions(+), 375 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index e5530a5..19f0dd5 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -231,14 +231,6 @@ AC_MSG_CHECKING([whether to build the system tray plugin])
 AM_CONDITIONAL([PAROLE_TRAY_PLUGIN], [test x"$ac_tray_plugin" = x"yes"])
 AC_MSG_RESULT([$ac_tray_plugin])
 
-# Power Manager
-#--
-AC_ARG_ENABLE([power-manager-plugin], 
AC_HELP_STRING([--disable-power-manager-plugin], [Don't build the power manager 
plugin]),
-  [ac_power_manager_plugin=$enableval], [ac_power_manager_plugin=yes])
-AC_MSG_CHECKING([whether to build the power manager plugin])
-AM_CONDITIONAL([POWER_MANAGER_PLUGIN], [test x"$ac_power_manager_plugin" = 
x"yes"])
-AC_MSG_RESULT([$ac_power_manager_plugin])
-
 #===#
 #  Check for debugging support  #
 #===#
@@ -273,7 +265,6 @@ src/plugins/Makefile
 src/plugins/sample/Makefile
 src/plugins/notify/Makefile
 src/plugins/tray/Makefile
-src/plugins/power-manager/Makefile
 docs/Makefile
 docs/plugin-api/version.xml
 docs/plugin-api/Makefile
@@ -304,9 +295,6 @@ echo "
 echo "
 System Tray icon:   ${ac_tray_plugin}" 
 
-echo "
-Power Manager:  ${ac_power_manager_plugin}
-
 --
 
 Configuration finished, type make to compile"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1b92d58..aa47f17 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,4 +28,3 @@ src/plugins/tray/tray-plugin.c
 src/plugins/tray/tray-provider.c
 src/plugins/tray/tray-provider.h
 src/plugins/tray/system-tray.desktop.in
-src/plugins/power-manager/power-manager.desktop.in
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 14fa33c..7b2439b 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -6,8 +6,4 @@ endif
 
 if PAROLE_NOTIFY_PLUGIN
 SUBDIRS+=notify
-endif
-
-if POWER_MANAGER_PLUGIN
-SUBDIRS+=power-manager
-endif
+endif
\ No newline at end of file
diff --git a/src/plugins/power-manager/Makefile.am 
b/src/plugins/power-manager/Makefile.am
deleted file mode 100644
index f95a79a..000
--- a/src/plugins/power-manager/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-INCLUDES = \
-   -I$(top_builddir)   \
-   -I$(top_srcdir) \
-   -I$(top_srcdir)/src \
-   -DG_LOG_DOMAIN=\"power-manager_plugin\" \
-   -DLIBEXECDIR=\"$(libexecdir)\"  \
-   -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-
-pluginsdir =   \
-   $(libdir)/parole-$(PAROLE_VERSION_API)
-
-plugins_LTLIBRARIES =  \
-   power-manager-plugin.la
-
-power_manager_plugin_la_SOURCES =  \
-   power-manager-plugin.c  \
-   power-manager-provider.c\
-   power-manager-provider.h
-
-power_manager_plugin_la_CFLAGS =   \
-   $(PLATFORM_CFLAGS)  \
-   $(GTK_CFLAGS)   \
-   $(LIBXFCE4UTIL_CFLAGS)  \
-   $(DBUS_GLIB_CFLAGS)
-
-power_manager_plugin_la_LIBADD =   \
-   $(top_builddir)/src/misc/libparole.la   \
-   $(LIBXFCE4UTIL_LIBS)\
-   $(DBUS_GLIB_LIBS)
-
-power_manager_plugin_la_LDFLAGS =  \
-   -avoid-version  \
-   -export-dynamic \
-   -module \
-   $(PLATFORM_LDFLAGS)
-
-#
-# .desktop file
-#
-desktop_in_files = power-manager.desktop.in
-desktopdir = $(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API)
-desktop_DATA =  $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST =   \
-   $(desktop_in_files)
-
-DISTCLEANFILES =   \
-   $(desktop_DATA)
diff --git a/src/plugins/power-manager/power-manager-plugin.c 
b/src/plugins/power-manager/p

[Xfce4-commits] Move destroying into _midori_browser_remove_tab

2013-03-05 Thread Christian Dywan 
Updating branch refs/heads/master
 to b023b27a92838cb31e7986951271c4ac48bf2bf6 (commit)
   from 8ab022ddf083b6a266ec2d93a226a2d64e87fcbd (commit)

commit b023b27a92838cb31e7986951271c4ac48bf2bf6
Author: Christian Dywan 
Date:   Tue Mar 5 23:31:47 2013 +0100

Move destroying into _midori_browser_remove_tab

Don't directly destroy in _action_tab_close_other_activate

Fixes: https://bugs.launchpad.net/midori/+bug/1116864

 midori/midori-browser.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index bdd24a2..0dec76b 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1474,6 +1474,8 @@ _midori_browser_remove_tab (MidoriBrowser* browser,
 #ifdef HAVE_GRANITE
 granite_widgets_dynamic_notebook_remove_tab (
 GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), 
midori_view_get_tab (view));
+#else
+gtk_widget_destroy (widget);
 #endif
 if (midori_browser_tab_connected (browser, view))
 midori_browser_disconnect_tab (browser, view);
@@ -4671,7 +4673,7 @@ _action_tab_close_other_activate (GtkAction* action,
 for (; tabs; tabs = g_list_next (tabs))
 {
 if (tabs->data != view)
-gtk_widget_destroy (tabs->data);
+midori_browser_close_tab (browser, tabs->data);
 }
 g_list_free (tabs);
 }
@@ -7366,7 +7368,6 @@ midori_browser_close_tab (MidoriBrowser* browser,
 
 midori_browser_add_tab_to_trash (browser, MIDORI_VIEW (view));
 g_signal_emit (browser, signals[REMOVE_TAB], 0, view);
-gtk_widget_destroy (view);
 }
 
 /**
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Korean (ko) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to ad0357cdd019c547ca5b7a223c1cef8f99164afd (commit)
   from c95b7e15d890e005c4338eb5a330fbc94f5bab67 (commit)

commit ad0357cdd019c547ca5b7a223c1cef8f99164afd
Author: Seong-ho Cho 
Date:   Tue Mar 5 19:41:30 2013 +0100

l10n: Updated Korean (ko) translation to 100%

New status: 393 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/ko.po |  388 +++---
 1 files changed, 245 insertions(+), 143 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 45a6047..8834ec0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,29 +3,30 @@
 # This file is distributed under the same license as the xfce4-panel package.
 # ByungHyun Choi, 2005.
 # Seong-ho Cho , 2011, 2012.
-#
+# 
 # Please write your name and e-mail into "translator-credits" if you update 
this translation script.
-#
+# 
 # ex ) msgstr ""
 #  "Gil-dong Hong \n"
 #  "YourName Kim "
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-panel 4.7.0\n"
-"Report-Msgid-Bugs-To: 
https://bugzilla.xfce.org/enter_bug.cgi?product=Xfce4-panel\n";
-"POT-Creation-Date: 2012-04-18 09:27+\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-05 13:27+\n"
 "PO-Revision-Date: 2012-04-18 23:14+0900\n"
 "Last-Translator: Seong-ho Cho \n"
 "Language-Team: xfce-i18n \n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../panel-desktop-handler.desktop.in.h:1
-msgid "Add a new launcher to the panel based on the information of this 
desktop file"
+msgid ""
+"Add a new launcher to the panel based on the information of this desktop file"
 msgstr "이 데스크톱 파일의 정보에 기반하여 새로운 실행 아이콘을 패널에 등록"
 
 #: ../panel-desktop-handler.desktop.in.h:2
@@ -37,8 +38,7 @@ msgid "Customize the panel"
 msgstr "패널을 취향대로 설정하기"
 
 #: ../panel-preferences.desktop.in.h:2
-#: ../panel/panel-preferences-dialog.glade.h:29
-#: ../panel/panel-window.c:2353
+#: ../panel/panel-preferences-dialog.glade.h:29 ../panel/panel-window.c:2353
 #: ../migrate/main.c:117
 msgid "Panel"
 msgstr "패널"
@@ -65,20 +65,17 @@ msgid "Pane_l"
 msgstr "패널(_L)"
 
 #. add new items
-#: ../libxfce4panel/xfce-panel-plugin.c:1244
-#: ../panel/panel-window.c:2365
+#: ../libxfce4panel/xfce-panel-plugin.c:1244 ../panel/panel-window.c:2365
 msgid "Add _New Items..."
 msgstr "새로운 항목 추가(_N)..."
 
 #. customize panel
-#: ../libxfce4panel/xfce-panel-plugin.c:1255
-#: ../panel/panel-window.c:2376
+#: ../libxfce4panel/xfce-panel-plugin.c:1255 ../panel/panel-window.c:2376
 msgid "Panel Pr_eferences..."
 msgstr "패널 기본 설정(_E)..."
 
 #. logout item
-#: ../libxfce4panel/xfce-panel-plugin.c:1272
-#: ../panel/panel-window.c:2404
+#: ../libxfce4panel/xfce-panel-plugin.c:1272 ../panel/panel-window.c:2404
 msgid "Log _Out"
 msgstr "로그아웃(_O)"
 
@@ -86,8 +83,7 @@ msgstr "로그아웃(_O)"
 msgid "Show the 'Panel Preferences' dialog"
 msgstr "'패널 기본 설정' 대화상자 표시"
 
-#: ../panel/main.c:79
-#: ../panel/main.c:80
+#: ../panel/main.c:79 ../panel/main.c:80
 msgid "PANEL-NUMBER"
 msgstr "PANEL-NUMBER"
 
@@ -183,54 +179,67 @@ msgid "Failed to send D-Bus message"
 msgstr "D-Bus 메시지를 보내는데 실패했습니다"
 
 #: ../panel/main.c:400
-msgid "Do you want to start the panel? If you do, make sure you save the 
session on logout, so the panel is automatically started the next time you 
login."
-msgstr "패널을 시작하시렵니까? 패널을 시작 하면, 로그아웃시 세션을 저장하는지 확인하여 다음번 로그인시 패널이 자동으로 시작하도록 
합니다."
+msgid ""
+"Do you want to start the panel? If you do, make sure you save the session on "
+"logout, so the panel is automatically started the next time you login."
+msgstr ""
+"패널을 시작하시렵니까? 패널을 시작 하면, 로그아웃시 세션을 저장하는지 확인하"
+"여 다음번 로그인시 패널이 자동으로 시작하도록 합니다."
 
-#: ../panel/main.c:403
-#: ../panel/main.c:417
+#: ../panel/main.c:403 ../panel/main.c:417
 #, c-format
 msgid "No running instance of %s was found"
 msgstr "%s의 인스턴스를 실행하지 않았습니다"
 
-#: ../panel/panel-application.c:212
+#: ../panel/panel-application.c:216
 msgid "Failed to launch the migration application"
 msgstr "마이그레이션 프로그램을 실행하는데 실패했습니다"
 
-#: ../panel/panel-application.c:936
+#: ../panel/panel-application.c:982
 msgid "Create _Launcher"
 msgstr "실행 아이콘 만들기(_L)"
 
-#: ../panel/panel-application.c:937
-msgid "This will create a new launcher plugin on the panel and inserts the 
dropped files as menu items."
+#: ../panel/panel-application.c:983
+msgid ""
+"This will create a new launcher plugin on the panel and inserts the dropped "
+"files as menu items."
 msgstr "패널에 새 실행 아이콘 플러그인을 만들고 파일을 메뉴 항목으로 넣습니다."
 
-#: ../panel/panel-application.c:939
+#: ../panel/panel-application.c:985
 #, c-format
 msgid "Create new launcher from %d desktop file"
 msgid_plural "Create new launcher from %d desktop files"
 msgstr[0] "%d개의 데스크톱 파일에 대한 새 실행 아이콘 만들기"
 
-#: ../panel/panel-application.c:1673
-msgid "You have started X without session manager. Clicking Qu

[Xfce4-commits] Use cache_dir_for_reading in about:paths

2013-03-05 Thread Christian Dywan 
Updating branch refs/heads/master
 to 8ab022ddf083b6a266ec2d93a226a2d64e87fcbd (commit)
   from 9e201e9e66804525e7d11b9f65e872cf466db5ba (commit)

commit 8ab022ddf083b6a266ec2d93a226a2d64e87fcbd
Author: Christian Dywan 
Date:   Tue Mar 5 18:58:50 2013 +0100

Use cache_dir_for_reading in about:paths

 midori/midori-view.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 6488dc2..b37ed6c 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4107,7 +4107,7 @@ midori_view_set_uri (MidoriView*  view,
 "tmp: %s"
 "",
 uri, midori_paths_get_config_dir_for_reading (), res_dir,
-lib_dir, midori_paths_get_cache_dir (), 
midori_paths_get_tmp_dir ());
+lib_dir, midori_paths_get_cache_dir_for_reading (), 
midori_paths_get_tmp_dir ());
 g_free (res_dir);
 g_free (lib_dir);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] NULL-check name in string_append_item

2013-03-05 Thread Christian Dywan 
Updating branch refs/heads/master
 to 9e201e9e66804525e7d11b9f65e872cf466db5ba (commit)
   from 12cc7d81707c663900d10a1591f5247ebc7e23fb (commit)

commit 9e201e9e66804525e7d11b9f65e872cf466db5ba
Author: Christian Dywan 
Date:   Tue Mar 5 18:57:44 2013 +0100

NULL-check name in string_append_item

 midori/midori-array.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/midori/midori-array.c b/midori/midori-array.c
index 87e826c..06877e3 100644
--- a/midori/midori-array.c
+++ b/midori/midori-array.c
@@ -730,7 +730,7 @@ string_append_item (GString*   string,
 string_append_escaped (string, katze_item_get_uri (item));
 g_string_append (string, "\">\n");
 /* Strip LRE leading character */
-if (g_str_has_prefix (item->name, "‪"))
+if (item->name != NULL && g_str_has_prefix (item->name, "‪"))
 string_append_xml_element (string, "title",
 g_utf8_next_char (strstr (item->name, "‪")));
 else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Drop the scrollwheel callback on the progress-scale

2013-03-05 Thread Simon Steinbeiss 
Updating branch refs/heads/master
 to 99548fb13d88e71aff2ad2e86fc47463f2227f16 (commit)
   from 5620c89368cd303e50984fb3037d7d485dc58bcb (commit)

commit 99548fb13d88e71aff2ad2e86fc47463f2227f16
Author: Simon Steinbeiss 
Date:   Tue Mar 5 17:44:26 2013 +0100

Drop the scrollwheel callback on the progress-scale

 data/interfaces/parole.ui |1 -
 src/parole-player.c   |   22 --
 2 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index fdc099a..bb33518 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -890,7 +890,6 @@
 
 
 
-
   
   
 True
diff --git a/src/parole-player.c b/src/parole-player.c
index 4b3a688..5dc832d 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -149,10 +149,6 @@ voidparole_player_back_cb  
(GtkButton *button,
 void   parole_player_seekf_cb (GtkWidget *widget, ParolePlayer 
*player, gdouble seek);
 
 void   parole_player_seekb_cb (GtkWidget *widget, ParolePlayer 
*player, gdouble seek);
-
-gbooleanparole_player_scroll_event_cb  (GtkWidget *widget,
-GdkEventScroll *ev,
-ParolePlayer *player);
 
 gbooleanparole_player_window_state_event (GtkWidget *widget,
 GdkEventWindowState *event,
@@ -1658,24 +1654,6 @@ void parole_player_seekb_cb (GtkWidget *widget, 
ParolePlayer *player, gdouble se
parole_player_change_range_value (player, seek);
 }
 
-gboolean parole_player_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, 
ParolePlayer *player)
-{
-gboolean ret_val = FALSE;
-
-if ( ev->direction == GDK_SCROLL_UP )
-{
-   parole_player_forward_cb (NULL, player);
-ret_val = TRUE;
-}
-else if ( ev->direction == GDK_SCROLL_DOWN )
-{
-   parole_player_back_cb (NULL, player);
-ret_val = TRUE;
-}
-
-return ret_val;
-}
-
 gboolean
 parole_player_range_button_release (GtkWidget *widget, GdkEventButton *ev, 
ParolePlayer *player)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Make single row default for new plugin instances.

2013-03-05 Thread Harald Judt 
Updating branch refs/heads/master
 to 652946f85a33ec041500e4b00135cc74f8056503 (commit)
   from 808242e32c2ce0708463cb47075b3becdef44c1c (commit)

commit 652946f85a33ec041500e4b00135cc74f8056503
Author: Harald Judt 
Date:   Tue Mar 5 17:19:41 2013 +0100

Make single row default for new plugin instances.

Not sure why it doesn't get set; reading config file should actually
take care of the missing value.

 panel-plugin/weather.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
index 9a88bc4..b078d9f 100644
--- a/panel-plugin/weather.c
+++ b/panel-plugin/weather.c
@@ -1770,6 +1770,7 @@ xfceweather_create_control(XfcePanelPlugin *plugin)
 data->forecast_layout = FC_LAYOUT_LIST;
 data->forecast_days = DEFAULT_FORECAST_DAYS;
 data->round = TRUE;
+data->single_row = TRUE;
 
 /* Setup update infos */
 init_update_infos(data);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix uninitialized variables and switch statements without default values.

2013-03-05 Thread Harald Judt 
Updating branch refs/heads/master
 to 808242e32c2ce0708463cb47075b3becdef44c1c (commit)
   from a4c62fbb977f823ffb7d13c4793af187e14fc94f (commit)

commit 808242e32c2ce0708463cb47075b3becdef44c1c
Author: Harald Judt 
Date:   Tue Mar 5 17:10:52 2013 +0100

Fix uninitialized variables and switch statements without default values.

 panel-plugin/weather-config.c |   31 ---
 panel-plugin/weather-data.c   |5 -
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
index 9be3467..c36a5f9 100644
--- a/panel-plugin/weather-config.c
+++ b/panel-plugin/weather-config.c
@@ -384,22 +384,23 @@ setup_altitude(xfceweather_dialog *dialog)
 G_CALLBACK(spin_alt_value_changed),
 dialog);
 switch (dialog->pd->units->altitude) {
-case METERS:
+case FEET:
 gtk_label_set_text(GTK_LABEL(dialog->label_alt_unit),
-   _("meters"));
+   _("feet"));
 gtk_spin_button_set_range(GTK_SPIN_BUTTON(dialog->spin_alt),
-  -420, 1);
+  -1378.0, 32808);
 gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_alt),
-  (gdouble) (dialog->pd->msl));
+  (gdouble) dialog->pd->msl / 0.3048);
 break;
 
-case FEET:
+case METERS:
+default:
 gtk_label_set_text(GTK_LABEL(dialog->label_alt_unit),
-   _("feet"));
+   _("meters"));
 gtk_spin_button_set_range(GTK_SPIN_BUTTON(dialog->spin_alt),
-  -1378.0, 32808);
+  -420, 1);
 gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_alt),
-  (gdouble) dialog->pd->msl / 0.3048);
+  (gdouble) (dialog->pd->msl));
 break;
 }
 g_signal_handlers_unblock_by_func(dialog->spin_alt,
@@ -626,7 +627,7 @@ create_location_page(xfceweather_dialog *dialog)
 static void
 combo_unit_temperature_set_tooltip(GtkWidget *combo)
 {
-gchar *text;
+gchar *text = NULL;
 gint value = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
 switch (value) {
@@ -685,7 +686,7 @@ combo_unit_temperature_changed(GtkWidget *combo,
 static void
 combo_unit_pressure_set_tooltip(GtkWidget *combo)
 {
-gchar *text;
+gchar *text = NULL;
 gint value = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
 switch (value) {
@@ -743,7 +744,7 @@ combo_unit_pressure_changed(GtkWidget *combo,
 static void
 combo_unit_windspeed_set_tooltip(GtkWidget *combo)
 {
-gchar *text;
+gchar *text = NULL;
 gint value = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
 switch (value) {
@@ -793,7 +794,7 @@ combo_unit_windspeed_changed(GtkWidget *combo,
 static void
 combo_unit_precipitations_set_tooltip(GtkWidget *combo)
 {
-gchar *text;
+gchar *text = NULL;
 gint value = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
 switch (value) {
@@ -831,7 +832,7 @@ combo_unit_precipitations_changed(GtkWidget *combo,
 static void
 combo_unit_altitude_set_tooltip(GtkWidget *combo)
 {
-gchar *text;
+gchar *text = NULL;
 gint value = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
 switch (value) {
@@ -873,7 +874,7 @@ combo_unit_altitude_changed(GtkWidget *combo,
 static void
 combo_apparent_temperature_set_tooltip(GtkWidget *combo)
 {
-gchar *text;
+gchar *text = NULL;
 gint value = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
 switch (value) {
@@ -1114,7 +1115,7 @@ combo_tooltip_style_changed(GtkWidget *combo,
 static void
 combo_forecast_layout_set_tooltip(GtkWidget *combo)
 {
-gchar *text;
+gchar *text = NULL;
 gint value = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
 switch (value) {
diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
index 5615fb4..714cce4 100644
--- a/panel-plugin/weather-data.c
+++ b/panel-plugin/weather-data.c
@@ -259,6 +259,9 @@ calc_apparent_temperature(const xml_location *loc,
Forecasting. 13, 1998, S. 1187–1193 */
 return 1.41 - 1.162 * windspeed + 0.980 * temp
 + 0.0124 * windspeed * windspeed + 0.0185 * windspeed * temp;
+
+default:
+return temp;
 }
 }
 
@@ -1127,7 +1130,7 @@ make_forecast_data(xml_weather *wd,
 xml_time *ts1, *ts2, *interval = NULL;
 struct tm point_tm, start_tm, end_tm, tm1, tm2;
 time_t point_t, start_t, end_t;
-gint min, max, point, i, j;
+gint min = 0, max = 0, point = 0, i, j;
 
 g_assert(wd != NULL);
 if (G_UNLIKELY(wd == NULL))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to afbfda8fbb80cb8731e2bc59c98d3f923a3b173c (commit)
   from 5b03c5cef9c9991b181539cc8b3cf2f6be46d225 (commit)

commit afbfda8fbb80cb8731e2bc59c98d3f923a3b173c
Author: Саша Петровић 
Date:   Tue Mar 5 15:32:58 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 738 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |  274 +++---
 1 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 1090d3f..310c55d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-31 06:48+\n"
+"POT-Creation-Date: 2013-03-05 11:36+\n"
 "PO-Revision-Date: 2012-12-06 16:14+0100\n"
 "Last-Translator: Саша Петровић \n"
 "Language-Team: српски \n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 2.91.5\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
(n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../thunar/main.c:62
 msgid "Open the bulk rename dialog"
@@ -140,7 +140,7 @@ msgstr "Нисам успео да покренем радњу"
 #: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:402
 #: ../thunar/thunar-location-entry.c:430
 #: ../thunar/thunar-shortcuts-view.c:1630
-#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:2223
+#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:2235
 #, c-format
 msgid "Failed to open \"%s\""
 msgstr "Нисам успео да отворим „%s“"
@@ -258,7 +258,7 @@ msgstr "Да ли да уклоним све ставке из смећа?"
 #. prepare the menu item
 #: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:179
 #: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1183
-#: ../thunar/thunar-window.c:344 ../plugins/thunar-tpa/thunar-tpa.c:189
+#: ../thunar/thunar-window.c:351 ../plugins/thunar-tpa/thunar-tpa.c:189
 msgid "_Empty Trash"
 msgstr "_Избаци смеће"
 
@@ -398,38 +398,38 @@ msgid "Failed to remove \"%s\""
 msgstr "Нисам успео да уклоним „%s“"
 
 #: ../thunar/thunar-chooser-dialog.c:755
-#: ../plugins/thunar-uca/thunar-uca-editor.c:473
+#: ../plugins/thunar-uca/thunar-uca-editor.c:474
 msgid "Select an Application"
 msgstr "Изаберите програм"
 
 #: ../thunar/thunar-chooser-dialog.c:765
 #: ../thunar/thunar-renamer-dialog.c:1068
-#: ../plugins/thunar-uca/thunar-uca-editor.c:483
+#: ../plugins/thunar-uca/thunar-uca-editor.c:484
 msgid "All Files"
 msgstr "Све датотеке"
 
 #: ../thunar/thunar-chooser-dialog.c:770
-#: ../plugins/thunar-uca/thunar-uca-editor.c:488
+#: ../plugins/thunar-uca/thunar-uca-editor.c:489
 msgid "Executable Files"
 msgstr "Извршне датотеке"
 
 #: ../thunar/thunar-chooser-dialog.c:785
-#: ../plugins/thunar-uca/thunar-uca-editor.c:503
+#: ../plugins/thunar-uca/thunar-uca-editor.c:504
 msgid "Perl Scripts"
 msgstr "Перл скрипте"
 
 #: ../thunar/thunar-chooser-dialog.c:791
-#: ../plugins/thunar-uca/thunar-uca-editor.c:509
+#: ../plugins/thunar-uca/thunar-uca-editor.c:510
 msgid "Python Scripts"
 msgstr "Питонове скрипте"
 
 #: ../thunar/thunar-chooser-dialog.c:797
-#: ../plugins/thunar-uca/thunar-uca-editor.c:515
+#: ../plugins/thunar-uca/thunar-uca-editor.c:516
 msgid "Ruby Scripts"
 msgstr "Руби скрипте"
 
 #: ../thunar/thunar-chooser-dialog.c:803
-#: ../plugins/thunar-uca/thunar-uca-editor.c:521
+#: ../plugins/thunar-uca/thunar-uca-editor.c:522
 msgid "Shell Scripts"
 msgstr "Скрипте шкољке"
 
@@ -527,7 +527,7 @@ msgstr "Самостално про_шири колоне уколико је п
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:503
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:285
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:286
-#: ../plugins/thunar-uca/thunar-uca-editor.c:605
+#: ../plugins/thunar-uca/thunar-uca-editor.c:606
 msgid "Unknown"
 msgstr "Непознато"
 
@@ -818,7 +818,7 @@ msgid "File Name"
 msgstr "Име датотеке"
 
 #: ../thunar/thunar-file.c:929 ../thunar/thunar-gio-extensions.c:236
-#: ../thunar/thunar-shortcuts-model.c:891 ../thunar/thunar-window.c:362
+#: ../thunar/thunar-shortcuts-model.c:891 ../thunar/thunar-window.c:369
 msgid "File System"
 msgstr "Систем датотека"
 
@@ -1345,7 +1345,7 @@ msgstr "Отвори у новом прозору"
 msgid "Create _Folder..."
 msgstr "Направи _фасциклу..."
 
-#: ../thunar/thunar-location-buttons.c:179 ../thunar/thunar-window.c:344
+#: ../thunar/thunar-location-buttons.c:179 ../thunar/thunar-window.c:351
 msgid "Delete all files and folders in the Trash"
 msgstr "Избаци све датотеке и фасцикле из Смећа"
 
@@ -1406,7 +1406,7 @@ msgstr "Отвори место"
 msgid "_Location:"
 msgstr "_Место:"
 
-#: ../thunar/thunar-location-en

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to 1acce9fea8f647753ab98c06368c284d6eb9145e (commit)
   from 0c71cc9f685d31b903f54496eb6148202cafbedb (commit)

commit 1acce9fea8f647753ab98c06368c284d6eb9145e
Author: Саша Петровић 
Date:   Tue Mar 5 15:28:38 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 208 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 65a2037..5879fdc 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -735,7 +735,7 @@ msgstr "Гашење је онемогућено киоск подешавањи
 #: ../xfce4-session/xfsm-shutdown.c:638
 #, c-format
 msgid "Unknown shutdown method %d"
-msgstr "Непознати начин гашења %d"
+msgstr "Непознати начин искључења %d"
 
 #: ../xfce4-session-logout/main.c:67
 msgid "Log out without displaying the logout dialog"
@@ -895,7 +895,7 @@ msgstr ""
 
 #: ../settings/xfce4-session-settings.glade.h:25
 msgid "Opens the configuration panel for the selected splash screen"
-msgstr "Отвара панел поставки изабраног поздравног екрана"
+msgstr "Отвара плочу поставки изабраног поздравног екрана"
 
 #: ../settings/xfce4-session-settings.glade.h:26
 msgid "Pro_mpt on logout"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to 0c71cc9f685d31b903f54496eb6148202cafbedb (commit)
   from fc058a7d55aca03207309a12163dd985c935904e (commit)

commit 0c71cc9f685d31b903f54496eb6148202cafbedb
Author: Саша Петровић 
Date:   Tue Mar 5 15:17:36 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 208 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |  136 +++---
 1 files changed, 86 insertions(+), 50 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 1735799..65a2037 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,11 +1,11 @@
 # salepetronije , 2012.
 # Саша Петровић , 2013.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-09 16:00+\n"
+"POT-Creation-Date: 2013-03-05 14:00+\n"
 "PO-Revision-Date: 2013-03-05 14:14+0100\n"
 "Last-Translator: Саша Петровић \n"
 "Language-Team: српски <>\n"
@@ -157,27 +157,23 @@ msgstr "ИБ ПРИКЉУЧНИЦЕ"
 msgid "Version information"
 msgstr "Подаци о издању"
 
-#: ../settings/main.c:75
-#: ../xfce4-session/main.c:257
+#: ../settings/main.c:75 ../xfce4-session/main.c:257
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Упишите „%s --help“ за коришћење."
 
-#: ../settings/main.c:87
-#: ../xfce4-session/main.c:267
+#: ../settings/main.c:87 ../xfce4-session/main.c:267
 #: ../xfce4-session-logout/main.c:136
 msgid "The Xfce development team. All rights reserved."
 msgstr "ИксФЦЕ развојна дружина. Сва права су задржана."
 
-#: ../settings/main.c:88
-#: ../xfce4-session/main.c:268
+#: ../settings/main.c:88 ../xfce4-session/main.c:268
 #: ../xfce4-session-logout/main.c:139
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Молим пријавите грешку на <%s>."
 
-#: ../settings/main.c:97
-#: ../xfce4-session/main.c:276
+#: ../settings/main.c:97 ../xfce4-session/main.c:276
 msgid "Unable to contact settings server"
 msgstr "Не могу да успоставим везу са служитељем подешавања"
 
@@ -222,8 +218,12 @@ msgid "Are you sure you want to empty the session cache?"
 msgstr "Да ли сте сигурни да желите испразнити оставу сесије?"
 
 #: ../settings/session-editor.c:172
-msgid "The saved states of your applications will not be restored during your 
next login."
-msgstr "Сачувана стања ваших програма неће бити повраћена приликом ваше 
следеће пријаве."
+msgid ""
+"The saved states of your applications will not be restored during your next "
+"login."
+msgstr ""
+"Сачувана стања ваших програма неће бити повраћена приликом ваше следеће "
+"пријаве."
 
 #: ../settings/session-editor.c:174
 msgid "_Proceed"
@@ -243,14 +243,17 @@ msgstr "Нису све датотеке у ИксФЦЕ остави могле
 msgid "Are you sure you want to terminate \"%s\"?"
 msgstr "Да ли сте сигурни да желите да окончате „%s“?"
 
-#: ../settings/session-editor.c:252
-#: ../settings/session-editor.c:280
+#: ../settings/session-editor.c:252 ../settings/session-editor.c:280
 msgid "Terminate Program"
 msgstr "Окончај програм"
 
 #: ../settings/session-editor.c:254
-msgid "The application will lose any unsaved state and will not be restarted 
in your next session."
-msgstr "Програм ће изгубити сва несачувана стања и неће бити покренут са вашом 
следећом сесијом."
+msgid ""
+"The application will lose any unsaved state and will not be restarted in "
+"your next session."
+msgstr ""
+"Програм ће изгубити сва несачувана стања и неће бити покренут са вашом "
+"следећом сесијом."
 
 #: ../settings/session-editor.c:256
 #: ../settings/xfce4-session-settings.glade.h:41
@@ -281,10 +284,8 @@ msgstr "Програм"
 msgid "Restart Style"
 msgstr "Начин поновног покретања"
 
-#: ../settings/splash-settings.c:291
-#: ../settings/splash-settings.c:294
-#: ../settings/splash-settings.c:297
-#: ../settings/splash-settings.c:300
+#: ../settings/splash-settings.c:291 ../settings/splash-settings.c:294
+#: ../settings/splash-settings.c:297 ../settings/splash-settings.c:300
 #: ../settings/splash-settings.c:357
 msgid "None"
 msgstr "Ништа"
@@ -301,8 +302,7 @@ msgstr "Назив:"
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../settings/xfae-dialog.c:124
-#: ../settings/xfae-model.c:479
+#: ../settings/xfae-dialog.c:124 ../settings/xfae-model.c:479
 msgid "Command:"
 msgstr "Наредба:"
 
@@ -334,28 +334,36 @@ msgstr "Нисам успео да упишем датотеку %s"
 msgid "Failed to open %s for reading"
 msgstr "Нисам успео да отворим %s за читање"
 
-#: ../settings/xfae-model.c:891
-#: ../settings/xfae-model.c:948
+#: ../settings/xfae-model.c:891 ../settings/xfae-model.c:948
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Нисам успео да отворим %s за писање"
 
 #: ../settings/xfae-window.c:102
-msgid "Below is the list of applications that will be started automatically 
when you login to your Xfce desktop, in addition to the applications that were 
saved when you logged out last time. Cursive applications belong to anot

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to d45d2a00033274375fb7669b02461c853f377056 (commit)
   from 9854be2e56f70b2c4d2181b6dca40f748dfd8d9c (commit)

commit d45d2a00033274375fb7669b02461c853f377056
Author: Саша Петровић 
Date:   Tue Mar 5 15:14:36 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 164 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 810f7b6..7e180b8 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the libxfce4ui package.
 # salepetronije , 2012.
 # Саша Петровић , 2013.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: libxfce4ui\n"
@@ -508,7 +508,7 @@ msgstr "Управља смештајем прозора на екрану."
 
 #: ../xfce4-about/main.c:74
 msgid "Panel"
-msgstr "Плоча"
+msgstr "Полица"
 
 #: ../xfce4-about/main.c:75
 msgid "Program launchers, window buttons, applications menu, workspace 
switcher and more."
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to fc058a7d55aca03207309a12163dd985c935904e (commit)
   from 56d669d6ce3b56f7d7cc0b1398f2e5e7998b7de3 (commit)

commit fc058a7d55aca03207309a12163dd985c935904e
Author: Саша Петровић 
Date:   Tue Mar 5 14:15:41 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 208 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |  179 +-
 1 files changed, 72 insertions(+), 107 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 8c48aae..1735799 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,17 +1,19 @@
 # salepetronije , 2012.
+# Саша Петровић , 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-11-09 16:00+\n"
-"PO-Revision-Date: 2012-06-20 08:20+0200\n"
-"Last-Translator: salepetronije \n"
-"Language-Team: српски \n"
+"PO-Revision-Date: 2013-03-05 14:14+0100\n"
+"Last-Translator: Саша Петровић \n"
+"Language-Team: српски <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../xfce.desktop.in.h:1
 msgid "Use this session to run Xfce as your desktop environment"
@@ -27,12 +29,12 @@ msgstr "Није дат опис"
 
 #: ../engines/balou/config.c:324
 msgid "Choose theme file to install..."
-msgstr "Изабери датотеку теме за инсталирање..."
+msgstr "Изабери датотеку теме за уградњу..."
 
 #: ../engines/balou/config.c:336
 #, c-format
 msgid "Unable to install splash theme from file \"%s\""
-msgstr "Не могу да инсталирам поздравну тему из датотеке „%s“"
+msgstr "Нисам успео да уградим поздравну тему из датотеке „%s“"
 
 #: ../engines/balou/config.c:339
 msgid "Theme File Error"
@@ -89,7 +91,7 @@ msgstr "Погон Миш поздравне теме"
 
 #: ../engines/simple/simple.c:346
 msgid "Configure Simple..."
-msgstr "Подеси примерак..."
+msgstr "Подеси Једноставну..."
 
 #: ../engines/simple/simple.c:357
 msgid "Font"
@@ -129,11 +131,11 @@ msgstr "Све датотеке"
 
 #: ../engines/simple/simple.c:497
 msgid "Simple"
-msgstr "Примерак"
+msgstr "Једноставна"
 
 #: ../engines/simple/simple.c:498
 msgid "Simple Splash Engine"
-msgstr "Погон примерка поздравне теме"
+msgstr "Погон поздравне теме Једноставно"
 
 #: ../scripts/xscreensaver.desktop.in.h:1
 msgid "Launch screensaver and locker program"
@@ -155,25 +157,29 @@ msgstr "ИБ ПРИКЉУЧНИЦЕ"
 msgid "Version information"
 msgstr "Подаци о издању"
 
-#: ../settings/main.c:75 ../xfce4-session/main.c:257
+#: ../settings/main.c:75
+#: ../xfce4-session/main.c:257
 #, c-format
 msgid "Type '%s --help' for usage."
 msgstr "Упишите „%s --help“ за коришћење."
 
-#: ../settings/main.c:87 ../xfce4-session/main.c:267
+#: ../settings/main.c:87
+#: ../xfce4-session/main.c:267
 #: ../xfce4-session-logout/main.c:136
 msgid "The Xfce development team. All rights reserved."
 msgstr "ИксФЦЕ развојна дружина. Сва права су задржана."
 
-#: ../settings/main.c:88 ../xfce4-session/main.c:268
+#: ../settings/main.c:88
+#: ../xfce4-session/main.c:268
 #: ../xfce4-session-logout/main.c:139
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Молим пријавите грешку на <%s>."
 
-#: ../settings/main.c:97 ../xfce4-session/main.c:276
+#: ../settings/main.c:97
+#: ../xfce4-session/main.c:276
 msgid "Unable to contact settings server"
-msgstr "Не могу да успоставим везу са сервером подешавања"
+msgstr "Не могу да успоставим везу са служитељем подешавања"
 
 #: ../settings/main.c:116
 msgid "Unable to create user interface from embedded definition data"
@@ -216,12 +222,8 @@ msgid "Are you sure you want to empty the session cache?"
 msgstr "Да ли сте сигурни да желите испразнити оставу сесије?"
 
 #: ../settings/session-editor.c:172
-msgid ""
-"The saved states of your applications will not be restored during your next "
-"login."
-msgstr ""
-"Сачувана стања ваших програма неће бити повраћена приликом ваше следеће "
-"пријаве."
+msgid "The saved states of your applications will not be restored during your 
next login."
+msgstr "Сачувана стања ваших програма неће бити повраћена приликом ваше 
следеће пријаве."
 
 #: ../settings/session-editor.c:174
 msgid "_Proceed"
@@ -241,17 +243,14 @@ msgstr "Нису све датотеке у ИксФЦЕ остави могле
 msgid "Are you sure you want to terminate \"%s\"?"
 msgstr "Да ли сте сигурни да желите да окончате „%s“?"
 
-#: ../settings/session-editor.c:252 ../settings/session-editor.c:280
+#: ../settings/session-editor.c:252
+#: ../settings/session-editor.c:280
 msgid "Terminate Program"
 msgstr "Окончај програм"
 
 #: ../settings/session-editor.c:254
-msgid ""
-"The application will lose any unsaved sta

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to 3375295fd2cb216b9a9ebf59821f71d60ef177da (commit)
   from 5df8000c988e9733289c74e2cb147bacdd64e5c3 (commit)

commit 3375295fd2cb216b9a9ebf59821f71d60ef177da
Author: Саша Петровић 
Date:   Tue Mar 5 14:03:24 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 68 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |   33 +
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 765ca4a..c6e4a35 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,20 +1,21 @@
 # This file is distributed under the same license as the xfce4-appfinder 
package.
 # salepetronije , 2012.
+# Саша Петровић , 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-appfinder.master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-06-20 08:54+\n"
-"PO-Revision-Date: 2012-06-06 18:49+0200\n"
-"Last-Translator: salepetronije \n"
-"Language-Team: српски \n"
+"PO-Revision-Date: 2013-03-05 14:02+0100\n"
+"Last-Translator: Саша Петровић \n"
+"Language-Team: српски <>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) \n"
 
 #: ../src/appfinder-category-model.c:146
 msgid "All Applications"
@@ -34,7 +35,7 @@ msgstr "Наредба"
 
 #: ../src/appfinder-model.c:548
 msgid "Categories"
-msgstr "Категорије"
+msgstr "Врсте"
 
 #: ../src/appfinder-model.c:549
 msgid "Filename"
@@ -113,8 +114,8 @@ msgid ""
 "or open the file in the same directory and remove the line \"%s\"."
 msgstr ""
 "Да опет прикажете ставку, морате ручно да уклоните датотеку покретача "
-"програма из „%s“ или да отворите датотеку у истом директоријуму и да "
-"уклоните ред „%s“."
+"програма из „%s“ или да отворите датотеку у истој фасцикли и да уклоните ред "
+"„%s“."
 
 #: ../src/appfinder-window.c:873 ../src/appfinder-window.c:965
 msgid "_Hide"
@@ -135,7 +136,7 @@ msgstr "Исписује податке о издању и излази"
 
 #: ../src/main.c:77
 msgid "Replace the existing service"
-msgstr "Мења постојећи сервис"
+msgstr "Мења постојећу услугу"
 
 #: ../src/main.c:78
 msgid "Quit all instances"
@@ -239,15 +240,15 @@ msgstr "Држи тренутно покренути _примерак у поз
 
 #: ../src/appfinder-preferences.glade.h:17
 msgid "Large"
-msgstr "Велике"
+msgstr "велике"
 
 #: ../src/appfinder-preferences.glade.h:18
 msgid "Larger"
-msgstr "Највеће"
+msgstr "највеће"
 
 #: ../src/appfinder-preferences.glade.h:19
 msgid "Normal"
-msgstr "Нормалне"
+msgstr "обичне"
 
 #: ../src/appfinder-preferences.glade.h:20
 msgid "Patte_rn:"
@@ -275,11 +276,11 @@ msgstr "Уклони тренутно обележену радњу."
 
 #: ../src/appfinder-preferences.glade.h:26
 msgid "Small"
-msgstr "Мале"
+msgstr "мале"
 
 #: ../src/appfinder-preferences.glade.h:27
 msgid "Smaller"
-msgstr "Малецне"
+msgstr "малецне"
 
 #: ../src/appfinder-preferences.glade.h:28
 msgid "Text besi_de icons"
@@ -287,11 +288,11 @@ msgstr "Текст пор_ед иконица"
 
 #: ../src/appfinder-preferences.glade.h:29
 msgid "Very Large"
-msgstr "Врло велике"
+msgstr "врло велике"
 
 #: ../src/appfinder-preferences.glade.h:30
 msgid "Very Small"
-msgstr "Врло мале"
+msgstr "врло мале"
 
 #: ../src/appfinder-preferences.glade.h:31
 msgid "_General"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to 9854be2e56f70b2c4d2181b6dca40f748dfd8d9c (commit)
   from d095aaf7a18deeaf8214bd7e3a3f1d27a95e18fb (commit)

commit 9854be2e56f70b2c4d2181b6dca40f748dfd8d9c
Author: Саша Петровић 
Date:   Tue Mar 5 13:54:35 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 164 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |  188 ++
 1 files changed, 55 insertions(+), 133 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 1ea6dcf..810f7b6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,19 +2,21 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the libxfce4ui package.
 # salepetronije , 2012.
+# Саша Петровић , 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: libxfce4ui\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-12-31 05:54+\n"
-"PO-Revision-Date: 2012-06-11 23:53+0200\n"
-"Last-Translator: salepetronije \n"
-"Language-Team: српски \n"
+"PO-Revision-Date: 2013-03-05 13:53+0100\n"
+"Last-Translator: Саша Петровић \n"
+"Language-Team: српски <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../libxfce4ui/xfce-dialogs.c:98
 msgid "Failed to open web browser for online documentation"
@@ -23,20 +25,18 @@ msgstr "Не успевам да отворим у веб прегледнику
 #: ../libxfce4ui/xfce-dialogs.c:213
 #, c-format
 msgid "Do you want to read the %s manual online?"
-msgstr "Да ли желите да читате %s документацију са мреже?"
+msgstr "Да ли желите да читате упутство за %s са мреже?"
 
 #: ../libxfce4ui/xfce-dialogs.c:215
 msgid "Do you want to read the manual online?"
-msgstr "Да ли желите да читате документацију са мреже?"
+msgstr "Да ли желите да читате упутства са мреже?"
 
 #: ../libxfce4ui/xfce-dialogs.c:218
 msgid "Online Documentation"
-msgstr "Документација са мреже"
+msgstr "Упутства са мреже"
 
 #: ../libxfce4ui/xfce-dialogs.c:221
-msgid ""
-"You will be redirected to the documentation website where the help pages are "
-"maintained and translated."
+msgid "You will be redirected to the documentation website where the help 
pages are maintained and translated."
 msgstr "Бићете преусмерени на веб страницу где се одржава и преводи помоћ."
 
 #: ../libxfce4ui/xfce-dialogs.c:225
@@ -45,11 +45,11 @@ msgstr "_Читај са мреже"
 
 #: ../libxfce4ui/xfce-dialogs.c:237
 msgid "_Always go directly to the online documentation"
-msgstr "_Увек иди директно на документацију на мрежи"
+msgstr "_Увек иди непосредно на упутство са мреже"
 
 #: ../libxfce4ui/xfce-dialogs.c:281
 msgid "Information"
-msgstr "Информације"
+msgstr "Обавештење"
 
 #: ../libxfce4ui/xfce-dialogs.c:314
 msgid "Warning"
@@ -96,19 +96,13 @@ msgstr "Управник сесије није вратио исправни И
 #. print warning for user
 #: ../libxfce4ui/xfce-spawn.c:413
 #, c-format
-msgid ""
-"Working directory \"%s\" does not exist. It won't be used when spawning \"%s"
-"\"."
-msgstr ""
-"Радна фасцикла „%s“ не постоји. Неће бити коришћена приликом израђања „%s“."
+msgid "Working directory \"%s\" does not exist. It won't be used when spawning 
\"%s\"."
+msgstr "Радна фасцикла „%s“ не постоји. Неће бити коришћена приликом израђања 
„%s“."
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:53
 #, c-format
-msgid ""
-"This shortcut is already being used for the action '%s'. Which action do you "
-"want to use?"
-msgstr ""
-"Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да користите?"
+msgid "This shortcut is already being used for the action '%s'. Which action 
do you want to use?"
+msgstr "Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да 
користите?"
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:54
 #: ../libxfce4kbd-private/xfce-shortcuts.c:57
@@ -129,19 +123,13 @@ msgstr "Задржи „%s“"
 #: ../libxfce4kbd-private/xfce-shortcuts.c:56
 #: ../libxfce4kbd-private/xfce-shortcuts.c:59
 #, c-format
-msgid ""
-"This shortcut is already being used for the command '%s'. Which action do "
-"you want to use?"
-msgstr ""
-"Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да користите?"
+msgid "This shortcut is already being used for the command '%s'. Which action 
do you want to use?"
+msgstr "Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да 
користите?"
 
 #: ../libxfce4kbd-private/xfce-shortcuts.c:62
 #, c-format
-msgid ""
-"This shortcut is already being used by the action '%s'. Which action do you "
-"want to use?"
-msgstr ""
-"Ова пречица се већ користи за наредбу „%s“. Коју наредбу желите да користите?"
+msgid "This shortcut is alrea

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to 17dd536eaf64e65137e35dd9e68df11904284b49 (commit)
   from 8d7d6751280a9422caaf381df7605f587e30ff05 (commit)

commit 17dd536eaf64e65137e35dd9e68df11904284b49
Author: Саша Петровић 
Date:   Tue Mar 5 13:42:23 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 31 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |   24 +---
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 0cf5222..a11543a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,20 +2,22 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Мирослав Николић , 2012.
+# Саша Петровић , 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: garson-master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-06-04 16:45+\n"
-"PO-Revision-Date: 2012-06-04 22:55+0200\n"
-"Last-Translator: Мирослав Николић \n"
-"Language-Team: Serbian \n"
+"PO-Revision-Date: 2013-03-05 13:40+0100\n"
+"Last-Translator: Саша Петровић \n"
+"Language-Team: српски <>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) \n"
 
 #: ../data/xfce/xfce-accessories.directory.in.h:1
 msgid "Accessories"
@@ -55,7 +57,7 @@ msgstr "Графика"
 
 #: ../data/xfce/xfce-graphics.directory.in.h:2
 msgid "Graphics creation and manipulation applications"
-msgstr "Програми за графичко стварање и уређивање"
+msgstr "Програми за графичко стваралаштво и уређивање"
 
 #: ../data/xfce/xfce-hardware.directory.in.h:1
 msgid "Hardware"
@@ -83,15 +85,15 @@ msgstr "Интернет"
 
 #: ../data/xfce/xfce-office.directory.in.h:1
 msgid "Office"
-msgstr "Канцеларија"
+msgstr "Уред"
 
 #: ../data/xfce/xfce-office.directory.in.h:2
 msgid "Office and productivity applications"
-msgstr "Канцеларијски и производни прогррами"
+msgstr "Програми за уређивање и стваралаштво"
 
 #: ../data/xfce/xfce-other.directory.in.h:1
 msgid "Applications that don't fit into other categories"
-msgstr "Програми који не припадају осталим категоријама"
+msgstr "Програми који не припадају осталим врстама"
 
 #: ../data/xfce/xfce-other.directory.in.h:2
 msgid "Other"
@@ -137,9 +139,9 @@ msgstr "Датотека „%s“ није пронађена"
 #: ../garcon/garcon-menu-parser.c:280
 #, c-format
 msgid "Could not load menu file data from %s: %s"
-msgstr "Не могу да учитам податке датотеке изборника из %s: %s"
+msgstr "Нисам успео да учитам податке датотеке изборника из %s: %s"
 
 #: ../garcon/garcon-menu-parser.c:287
 #, c-format
 msgid "Could not load menu file data from %s"
-msgstr "Не могу да учитам податке датотеке изборника из %s"
+msgstr "Нисам успео да учитам податке датотеке изборника из %s"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%

2013-03-05 Thread Transifex 
Updating branch refs/heads/master
 to 9390b05bdccbb074d0f2f7dc95cd8c9261884956 (commit)
   from 14766cd1e68c09d640d0e8516d93aecab991b9b8 (commit)

commit 9390b05bdccbb074d0f2f7dc95cd8c9261884956
Author: Саша Петровић 
Date:   Tue Mar 5 13:34:27 2013 +0100

l10n: Updated Serbian (sr) translation to 100%

New status: 279 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/sr.po |  299 ++
 1 files changed, 144 insertions(+), 155 deletions(-)

diff --git a/po/sr.po b/po/sr.po
index 9bd149b..31bbfd1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,20 +2,21 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the exo package.
 # Мирослав Николић , 2012, 2013.
+# Саша Петровић , 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: exo\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-01-23 10:03+\n"
-"PO-Revision-Date: 2013-01-23 11:40+0200\n"
-"Last-Translator: Мирослав Николић \n"
-"Language-Team: Serbian \n"
+"PO-Revision-Date: 2013-03-05 13:32+0100\n"
+"Last-Translator: Саша Петровић \n"
+"Language-Team: српски <>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: ../exo/exo-cell-renderer-ellipsized-text.c:131
 #: ../exo/exo-cell-renderer-icon.c:144
@@ -49,7 +50,7 @@ msgstr "величина"
 
 #: ../exo/exo-cell-renderer-icon.c:208
 msgid "The size of the icon to render in pixels."
-msgstr "Величина иконице за исцртавање у пикселима."
+msgstr "Величина иконице за исцртавање у тачкама."
 
 #: ../exo/exo-gdk-pixbuf-extensions.c:787
 #, c-format
@@ -63,18 +64,16 @@ msgstr "Нисам успео да прочитам датотеку „%s“: %
 
 #: ../exo/exo-gdk-pixbuf-extensions.c:890
 #, c-format
-msgid ""
-"Failed to load image \"%s\": Unknown reason, probably a corrupt image file"
-msgstr ""
-"Нисам успео да учитам слику „%s“: Разлог није познат, вероватно неисправан "
-"запис"
+msgid "Failed to load image \"%s\": Unknown reason, probably a corrupt image 
file"
+msgstr "Нисам успео да учитам слику „%s“: Разлог није познат, вероватно 
неисправан запис"
 
 #: ../exo/exo-gtk-extensions.c:227
 #, c-format
 msgid "Failed to open \"%s\"."
 msgstr "Нисам успео да отворим „%s“."
 
-#: ../exo/exo-icon-bar.c:277 ../exo/exo-icon-view.c:806
+#: ../exo/exo-icon-bar.c:277
+#: ../exo/exo-icon-view.c:806
 msgid "Orientation"
 msgstr "Усмерење"
 
@@ -82,21 +81,25 @@ msgstr "Усмерење"
 msgid "The orientation of the iconbar"
 msgstr "Усмерење траке иконице"
 
-#: ../exo/exo-icon-bar.c:294 ../exo/exo-icon-view.c:823
+#: ../exo/exo-icon-bar.c:294
+#: ../exo/exo-icon-view.c:823
 msgid "Pixbuf column"
-msgstr "Колона сличице"
+msgstr "Стубац сличице"
 
-#: ../exo/exo-icon-bar.c:295 ../exo/exo-icon-view.c:824
+#: ../exo/exo-icon-bar.c:295
+#: ../exo/exo-icon-view.c:824
 msgid "Model column used to retrieve the icon pixbuf from"
-msgstr "Колона у моделу из које се извлачи сличица иконице"
+msgstr "Стубац у моделу из које се извлачи сличица иконице"
 
-#: ../exo/exo-icon-bar.c:310 ../exo/exo-icon-view.c:950
+#: ../exo/exo-icon-bar.c:310
+#: ../exo/exo-icon-view.c:950
 msgid "Text column"
-msgstr "Колона текста"
+msgstr "Стубац текста"
 
-#: ../exo/exo-icon-bar.c:311 ../exo/exo-icon-view.c:951
+#: ../exo/exo-icon-bar.c:311
+#: ../exo/exo-icon-view.c:951
 msgid "Model column used to retrieve the text from"
-msgstr "Колона у моделу из којег се извлачи текст"
+msgstr "Стубац у моделу из којег се извлачи текст"
 
 #: ../exo/exo-icon-bar.c:323
 msgid "Icon Bar Model"
@@ -112,29 +115,35 @@ msgstr "Активно"
 
 #: ../exo/exo-icon-bar.c:341
 msgid "Active item index"
-msgstr "Активан индекс ставке"
+msgstr "Активан садржај ставке"
 
-#: ../exo/exo-icon-bar.c:347 ../exo/exo-icon-bar.c:348
+#: ../exo/exo-icon-bar.c:347
+#: ../exo/exo-icon-bar.c:348
 msgid "Active item fill color"
 msgstr "Боја испуњавања активне ставке"
 
-#: ../exo/exo-icon-bar.c:354 ../exo/exo-icon-bar.c:355
+#: ../exo/exo-icon-bar.c:354
+#: ../exo/exo-icon-bar.c:355
 msgid "Active item border color"
 msgstr "Боја ивице активне ставке"
 
-#: ../exo/exo-icon-bar.c:361 ../exo/exo-icon-bar.c:362
+#: ../exo/exo-icon-bar.c:361
+#: ../exo/exo-icon-bar.c:362
 msgid "Active item text color"
 msgstr "Боја текста активне ставке"
 
-#: ../exo/exo-icon-bar.c:368 ../exo/exo-icon-bar.c:369
+#: ../exo/exo-icon-bar.c:368
+#: ../exo/exo-icon-bar.c:369
 msgid "Cursor item fill color"
 msgstr "Боја испуњавања ставке курсора"
 
-#: ../exo/exo-icon-bar.c:375 ../exo/exo-icon-bar.c:376
+#: ../exo/exo-icon-bar.c:375
+#: ../exo/exo-icon-bar.c:376
 msgid "Cursor item border color"
 msgstr "Боја ивице ставк

[Xfce4-commits] Update the GtkRange when the user seeks (Fix bug #9761)

2013-03-05 Thread Simon Steinbeiss 
Updating branch refs/heads/master
 to 5620c89368cd303e50984fb3037d7d485dc58bcb (commit)
   from 7be7fe6aa63dca921dbadeb48bb84724109b3038 (commit)

commit 5620c89368cd303e50984fb3037d7d485dc58bcb
Author: Simon Steinbeiss 
Date:   Tue Mar 5 12:55:54 2013 +0100

Update the GtkRange when the user seeks (Fix bug #9761)

 src/parole-player.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index e906b9c..4b3a688 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1646,6 +1646,7 @@ void parole_player_seekf_cb (GtkWidget *widget, 
ParolePlayer *player, gdouble se
+
seek;
parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
+   parole_player_change_range_value (player, seek);
 }
 
 void parole_player_seekb_cb (GtkWidget *widget, ParolePlayer *player, gdouble 
seek)
@@ -1654,6 +1655,7 @@ void parole_player_seekb_cb (GtkWidget *widget, 
ParolePlayer *player, gdouble se
-
seek;
parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
+   parole_player_change_range_value (player, seek);
 }
 
 gboolean parole_player_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, 
ParolePlayer *player)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Remove redundant check for state_playing The signal only gets emitted if the state is "playing" anyway

2013-03-05 Thread Simon Steinbeiss 
Updating branch refs/heads/master
 to 7be7fe6aa63dca921dbadeb48bb84724109b3038 (commit)
   from 048762589625479a1504c6fb2090e4e5782cf3c2 (commit)

commit 7be7fe6aa63dca921dbadeb48bb84724109b3038
Author: Simon Steinbeiss 
Date:   Tue Mar 5 12:54:16 2013 +0100

Remove redundant check for state_playing
The signal only gets emitted if the state is "playing" anyway

 src/parole-player.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 38932b4..e906b9c 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1231,7 +1231,7 @@ parole_player_media_progressed_cb (ParoleGst *gst, const 
ParoleStream *stream, g
 g_return_if_fail (value > 0);
 #endif
 
-if ( !player->priv->user_seeking && player->priv->state == 
PAROLE_STATE_PLAYING )
+if (!player->priv->user_seeking)
 {
parole_player_change_range_value (player, value);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Simplify gstreamer-seek code

2013-03-05 Thread Simon Steinbeiss 
Updating branch refs/heads/master
 to 048762589625479a1504c6fb2090e4e5782cf3c2 (commit)
   from 4ea3c523f2a54ca56f46ab291767ed4e791b23db (commit)

commit 048762589625479a1504c6fb2090e4e5782cf3c2
Author: Simon Steinbeiss 
Date:   Tue Mar 5 12:02:56 2013 +0100

Simplify gstreamer-seek code

 src/gst/parole-gst.c |   24 ++--
 1 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 1e5689e..f81102c 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2611,34 +2611,14 @@ void parole_gst_shutdown (ParoleGst *gst)
 g_object_unref (gst->priv->playbin);
 }
 
-void parole_gst_seek (ParoleGst *gst, gdouble pos)
+void parole_gst_seek (ParoleGst *gst, gdouble seek)
 {
-gint64 seek;
-gint64 absolute_duration;
-gint64 duration;
-gboolean seekable;
-
 TRACE ("Seeking");
-
-g_object_get (G_OBJECT (gst->priv->stream),
- "absolute-duration", &absolute_duration,
- "duration", &duration,
- "seekable", &seekable,
- NULL);
- 
-#ifdef DEBUG
-g_return_if_fail (duration != 0);
-g_return_if_fail (absolute_duration != 0);
-g_return_if_fail (seekable == TRUE);
-#endif
-   
-seek = (pos * absolute_duration) / duration;
-
 g_warn_if_fail ( gst_element_seek (gst->priv->playbin,
   1.0,
   GST_FORMAT_TIME,
   GST_SEEK_FLAG_KEY_UNIT | 
GST_SEEK_FLAG_FLUSH,
-  GST_SEEK_TYPE_SET, seek,
+  GST_SEEK_TYPE_SET, (int) seek * 
GST_SECOND,
   GST_SEEK_TYPE_NONE, 
GST_CLOCK_TIME_NONE));
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits