[Goodies-commits] r2402 - in xfce4-xkb-plugin/trunk: . panel-plugin po

Nick Schermer nick at xfce.org
Wed Jan 17 18:51:43 CET 2007


Author: nick
Date: 2007-01-17 17:51:43 +0000 (Wed, 17 Jan 2007)
New Revision: 2402

Added:
   xfce4-xkb-plugin/trunk/configure.in.in
   xfce4-xkb-plugin/trunk/po/LINGUAS
Removed:
   xfce4-xkb-plugin/trunk/configure.ac
Modified:
   xfce4-xkb-plugin/trunk/ChangeLog
   xfce4-xkb-plugin/trunk/autogen.sh
   xfce4-xkb-plugin/trunk/panel-plugin/Makefile.am
   xfce4-xkb-plugin/trunk/panel-plugin/xkb-plugin.desktop.in.in
   xfce4-xkb-plugin/trunk/po/bg.po
   xfce4-xkb-plugin/trunk/po/ca.po
   xfce4-xkb-plugin/trunk/po/cs.po
   xfce4-xkb-plugin/trunk/po/de.po
   xfce4-xkb-plugin/trunk/po/el.po
   xfce4-xkb-plugin/trunk/po/eu.po
   xfce4-xkb-plugin/trunk/po/fr.po
   xfce4-xkb-plugin/trunk/po/gl.po
   xfce4-xkb-plugin/trunk/po/hu.po
   xfce4-xkb-plugin/trunk/po/ja.po
   xfce4-xkb-plugin/trunk/po/pl.po
   xfce4-xkb-plugin/trunk/po/ru.po
   xfce4-xkb-plugin/trunk/po/xfce4-xkb-plugin.pot
   xfce4-xkb-plugin/trunk/po/zh_TW.po
Log:
* Shorten the desktop file destription.
* Merge new string.
* Add LINGUAS support.
* Improve configure and make files.
* Bump version for release.


Modified: xfce4-xkb-plugin/trunk/ChangeLog
===================================================================
--- xfce4-xkb-plugin/trunk/ChangeLog	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/ChangeLog	2007-01-17 17:51:43 UTC (rev 2402)
@@ -1,3 +1,11 @@
+2007-01-17 Nick Schermer <nick at xfce.org>
+
+	* Shorten the desktop file destription.
+	* Merge new string.
+	* Add LINGUAS support.
+	* Improve configure and make files.
+	* Bump version for release.
+
 2007-01-16 19:52  Nick Schermer <nick at xfce.org>
 
 	* Fix compiler warning and a couple of other problems.

Modified: xfce4-xkb-plugin/trunk/autogen.sh
===================================================================
--- xfce4-xkb-plugin/trunk/autogen.sh	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/autogen.sh	2007-01-17 17:51:43 UTC (rev 2402)
@@ -2,11 +2,6 @@
 #
 # $Id$
 #
-# Copyright (c) 2002-2005
-#         The Xfce development team. All rights reserved.
-#
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
@@ -18,6 +13,20 @@
   exit 1
 }
 
+# verify that po/LINGUAS is present
+(test -f po/LINGUAS) >/dev/null 2>&1 || {
+  cat >&2 <<EOF
+autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
+            or try to checkout again.
+EOF
+  exit 1
+}
+
+# substitute revision and linguas
+linguas=`sed -e '/^#/d' po/LINGUAS`
+revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
+sed -e "s/@LINGUAS@/${linguas}/g" \
+    -e "s/@REVISION@/${revision}/g" \
+    < "configure.in.in" > "configure.in"
+
 exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:

Deleted: xfce4-xkb-plugin/trunk/configure.ac

Copied: xfce4-xkb-plugin/trunk/configure.in.in (from rev 2382, xfce4-xkb-plugin/trunk/configure.ac)
===================================================================
--- xfce4-xkb-plugin/trunk/configure.in.in	                        (rev 0)
+++ xfce4-xkb-plugin/trunk/configure.in.in	2007-01-17 17:51:43 UTC (rev 2402)
@@ -0,0 +1,79 @@
+dnl configure.ac
+dnl
+dnl xfce4-xkb-plugin - XKB plugin for xfce4-panel
+dnl
+dnl 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
+dnl
+
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([xkb_version_major], [0])
+m4_define([xkb_version_minor], [4])
+m4_define([xkb_version_micro], [3])
+m4_define([xkb_version_build], [r at REVISION@])
+m4_define([xkb_version_tag], [svn])
+m4_define([xkb_version], [xkb_version_major().xkb_version_minor().xkb_version_micro()ifelse(xkb_version_tag(), [svn], [xkb_version_tag()-xkb_version_build()], [xkb_version_tag()])])
+
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2006-2007
+        The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-xkb-plugin], [xkb_version()], [http://bugzilla.xfce.org/], [xfce4-xkb-plugin])
+AC_PREREQ([2.50])
+AC_CANONICAL_TARGET()
+AC_REVISION([$Id$])
+
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE()
+
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_LD()
+AC_PROG_INSTALL()
+AC_PROG_INTLTOOL()
+
+dnl *******************************
+dnl *** Check for UNIX variants ***
+dnl *******************************
+AC_AIX()
+AC_ISC_POSIX()
+AC_MINIX()
+AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])
+
+dnl *********************
+dnl *** Check for X11 ***
+dnl *********************
+XDT_CHECK_LIBX11_REQUIRE()
+
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([@LINGUAS@])
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
+XDT_FEATURE_DEBUG()
+
+AC_OUTPUT([
+panel-plugin/Makefile
+flags/Makefile
+Makefile
+po/Makefile.in
+])

Modified: xfce4-xkb-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-xkb-plugin/trunk/panel-plugin/Makefile.am	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/panel-plugin/Makefile.am	2007-01-17 17:51:43 UTC (rev 2402)
@@ -1,3 +1,4 @@
+# $Id$
 
 INCLUDES =										\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"						\
@@ -9,7 +10,7 @@
 
 xfce4_xkb_plugin_SOURCES =								\
 	xfce4-xkb-plugin.c								\
-	xkb.c																		\
+	xkb.c										\
 	xkb.h
 
 xfce4_xkb_plugin_CFLAGS =								\
@@ -25,20 +26,23 @@
 	@LIBXFCEGUI4_LIBS@								\
 	@LIBXFCE4UTIL_LIBS@
 
+#
+# Desktop file
+#
+desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = xkb-plugin.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
+%.desktop.in: %.desktop.in.in
+	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST =															\
+EXTRA_DIST =								\
 	$(desktop_in_in_files)
 
-DISTCLEANFILES = 									\
-	$(desktop_DATA) $(desktop_in_files)
+CLEANFILES =								\
+	$(desktop_in_files)						\
+	$(desktop_DATA)
 
-%.desktop.in: %.desktop.in.in
-	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
-		$< > $@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
 

Modified: xfce4-xkb-plugin/trunk/panel-plugin/xkb-plugin.desktop.in.in
===================================================================
--- xfce4-xkb-plugin/trunk/panel-plugin/xkb-plugin.desktop.in.in	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/panel-plugin/xkb-plugin.desktop.in.in	2007-01-17 17:51:43 UTC (rev 2402)
@@ -2,7 +2,7 @@
 Type=X-XFCE-PanelPlugin
 Encoding=UTF-8
 _Name=Keyboard Layout Switcher
-_Comment=Displays the current keyboard layout and switches the layout when clicked
+_Comment=Button to switch the X keyboard layout
 Icon=gnome-dev-keyboard
-X-XFCE-Exec=@PLUGIN_PATH@/xfce4-xkb-plugin
+X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-xkb-plugin
 X-XFCE-Unique=TRUE

Added: xfce4-xkb-plugin/trunk/po/LINGUAS
===================================================================
--- xfce4-xkb-plugin/trunk/po/LINGUAS	                        (rev 0)
+++ xfce4-xkb-plugin/trunk/po/LINGUAS	2007-01-17 17:51:43 UTC (rev 2402)
@@ -0,0 +1,2 @@
+# set of available languages (in alphabetic order)
+bg ca cs de el eu fr gl hu ja pl ru zh_TW

Modified: xfce4-xkb-plugin/trunk/po/bg.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/bg.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/bg.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-03-19 13:41+0900\n"
 "Last-Translator: Alexander Iliev <sasoiliev at mamul.org>\n"
 "Language-Team: Bulgarian <sasoiliev at mamul.org>\n"
@@ -15,12 +15,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Клавиатурна подредба"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -28,39 +28,42 @@
 "Позволява превключване на клавиатурните подредби\n"
 "и показва текущо-избраната подредба"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Тук ще намерите други плъгини"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Конфигуриране на клавиатурните подредби"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Показване на подредбата като"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "картинка"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "текст"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Настройки за приложения"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "Помнене на подредбата за всяко приложение"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Подредба по подразбиране:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
-msgstr "Показва и превключва клавиатурната подредба"
+msgid "Button to switch the X keyboard layout"
+msgstr ""
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr "Показва и превключва клавиатурната подредба"

Modified: xfce4-xkb-plugin/trunk/po/ca.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/ca.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/ca.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -8,20 +8,20 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-09-18 19:02+0200\n"
 "Last-Translator: Pau Ruŀlan Ferragut <paurullan at bulma.net>\n"
 "Language-Team: Catalan\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Canviador de disposicions de teclat"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -29,40 +29,42 @@
 "Permet commutar la distribució del teclat i\n"
 "mostra la distribució actual."
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Altres connectors disponibles"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Commuta la configuració de la distribució del teclat"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Mostra la distribució del teclat"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "imatge"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "text"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Paràmetres per aplicacions"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "_Recorda la distribució segons l’aplicacions"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Distribució per defecte:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
-msgstr "Mostra la distribució del teclat i la commuta en fer clic"
+msgid "Button to switch the X keyboard layout"
+msgstr ""
 
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr "Mostra la distribució del teclat i la commuta en fer clic"

Modified: xfce4-xkb-plugin/trunk/po/cs.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/cs.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/cs.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-08-27 12:13+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,12 +16,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Přepínač rozložení klávesnice"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -29,40 +29,43 @@
 "Umožňuje Vám přepnout rozložení klávesnice\n"
 "a zobrazuje aktuálně používané rozložení."
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Další zásuvné moduly jsou dostupné zde"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Konfigurovat přepínač rozvržení klávesnice"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Zobrazit rozvržení jako"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "obrázek"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "text"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Nastavení pro jednotlivé aplikace"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "_Pamatovat si rozvržení pro každou aplikaci zvlášť"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Výchozí rozvržení:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""
-"Zobrazuje aktuální rozložení klávesnice a přepíná rozvržení při kliknutí"
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr ""
+#~ "Zobrazuje aktuální rozložení klávesnice a přepíná rozvržení při kliknutí"

Modified: xfce4-xkb-plugin/trunk/po/de.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/de.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/de.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-09-18 19:26+0100\n"
 "Last-Translator: Frank Lanitz <frank at frank.uvena.de>\n"
 "Language-Team:  <frank at frank.uvena.de>\n"
@@ -12,12 +12,12 @@
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Tastaturlayoutumschalter"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -25,41 +25,44 @@
 "Bietet die Möglichkeit, das Tastaturlayout zu wechseln und zeigt das im "
 "Moment aktive Layout an. "
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Weitere Plugins kann man hier finden"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Einstellungen für das Tastaturlayout-Plugin"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Zeigen Layout an als"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "Bild"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "Text"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Weitere Optionen"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "_Benutze Layout für alle Anwendungen"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Standard Layout: "
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""
-"Zeigt das aktuelle Tastaturlayout an und erlaubt es, durch einen Klick das "
-"Layout zu wechseln. "
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr ""
+#~ "Zeigt das aktuelle Tastaturlayout an und erlaubt es, durch einen Klick "
+#~ "das Layout zu wechseln. "

Modified: xfce4-xkb-plugin/trunk/po/el.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/el.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/el.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-04-08 11:01+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg at serverhive.com>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -16,12 +16,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Εναλλάκτης διάταξης πληκτρολογίου"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -29,41 +29,44 @@
 "Επιτρέπει την εναλλαγή της διάταξης πληκτρολογίου\n"
 "και εμφανίζει την τρέχουσα διάταξη."
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Άλλα διαθέσιμα πρόσθετα"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Ρύθμιση εναλλάκτη διάταξης πληκτρολογίου"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Προβολή διάταξης ως"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "εικόνα"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "κείμενο"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Ρυθμίσεις ανά εφαρμογή"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "_Καταγραφή διάταξης ανά εφαρμογή"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Εξορισμού διάταξη:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""
-"Εμφανίζει την τρέχουσα διάταξη πληκτρολογίου και την αλλάζει όταν κάνετε "
-"κλικ επάνω"
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr ""
+#~ "Εμφανίζει την τρέχουσα διάταξη πληκτρολογίου και την αλλάζει όταν κάνετε "
+#~ "κλικ επάνω"

Modified: xfce4-xkb-plugin/trunk/po/eu.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/eu.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/eu.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-004-10 12:02+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Librezale <Librezale at librezale.org>\n"
@@ -15,12 +15,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Teklatu Ingurune Aldatzailea"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -28,40 +28,43 @@
 "Teklatu ingurunea aldatu edo erabilitako\n"
 "ingurunea ikusteko aukera ematen du."
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Hemen erabilgarri dauden beste plugin-ak"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Teklatu Ingurune Aldatzailea Konfiguratu"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Ikusi ingurunea horrela"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "irudia"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "testua"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Aplikazio ezarpen bakoitzagatik"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "Aplikazio bakoitzaren ingurunea gogo_ratu"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Lehenetsiriko ingurunea:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""
-"Erabilitako teklatu ingurunea bistarazi eta klikatzean aldatu egiten du"
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr ""
+#~ "Erabilitako teklatu ingurunea bistarazi eta klikatzean aldatu egiten du"

Modified: xfce4-xkb-plugin/trunk/po/fr.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/fr.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/fr.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin v0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-09-11 18:23+0100\n"
 "Last-Translator: Maximilian Schleiss <maxschleiss at bluewin.ch>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -15,12 +15,12 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Changeur de disposition de clavier"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -28,56 +28,68 @@
 "Permet de changer la disposition du clavier et\n"
 "affiche la disposition actuelle."
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Autres greffons disponibles ici"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Configurer le changeur de disposition de clavier"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Afficher la disposition en tant que"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "image"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "texte"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Paramètres par application"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "_Retenir les dispositions pour chaque application"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Disposition par défaut :"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid "Displays the current keyboard layout and switches the layout when clicked"
-msgstr "Affiche la disposition de clavier actuelle et la change par un clic de souris"
+msgid "Button to switch the X keyboard layout"
+msgstr ""
 
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr ""
+#~ "Affiche la disposition de clavier actuelle et la change par un clic de "
+#~ "souris"
+
 #~ msgid "RSS Aggregator"
 #~ msgstr "RSS agrégés"
+
 #~ msgid "RSS Feeds:"
 #~ msgstr "Flux RSS:"
+
 #~ msgid "Name"
 #~ msgstr "Nom"
+
 #~ msgid "URL"
 #~ msgstr "URL"
+
 #~ msgid "Feeds"
 #~ msgstr "Flux"
+
 #~ msgid "Refresh all"
 #~ msgstr "Rafraîchir"
+
 #~ msgid "RSS"
 #~ msgstr "RSS"
+
 #~ msgid "Check and display RSS feeds from the internet"
 #~ msgstr "Vérifier et afficher les flux RSS"
-

Modified: xfce4-xkb-plugin/trunk/po/gl.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/gl.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/gl.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-08-17 19:44+0000\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <gl at li.org>\n"
@@ -16,50 +16,49 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "imaxe"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "texto"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr ""
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""

Modified: xfce4-xkb-plugin/trunk/po/hu.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/hu.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/hu.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-07-08 01:13+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -17,12 +17,12 @@
 "X-Poedit-Language: Hungarian\n"
 "X-Poedit-Country: HUNGARY\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Billentyűkiosztás váltó"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -30,39 +30,42 @@
 "Lehetővé teszi a billentyűzet kiosztás váltását\n"
 "és kijelzi a mostanit."
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Más itt elérhető bővítmények"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Billentyűkiosztás váltó beállítása"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Megjelenítés mint"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "kép"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "szöveg"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Alkalmazásonkénti beállítás"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "_Emlékezz minden alkalmazás kiosztására"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Alapkiosztás:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
-msgstr "Kijelzi a jelenlegi billentyűkiosztást és kattintásra vált"
+msgid "Button to switch the X keyboard layout"
+msgstr ""
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr "Kijelzi a jelenlegi billentyűkiosztást és kattintásra vált"

Modified: xfce4-xkb-plugin/trunk/po/ja.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/ja.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/ja.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-03-19 13:41+0900\n"
 "Last-Translator: Daichi Kawahata <daichi at xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -17,12 +17,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "キーボードレイアウトの切り換え"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -30,40 +30,43 @@
 "現在のキーボードレイアウトを表示します。\n"
 "また、レイアウトを切り換える事ができます。"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "その他のプラグインはここにあります。"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "キーボードレイアウト切り換えの設定"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "レイアウトの表示方法"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "画像"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "文字"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "アプリケーション毎の設定"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "アプリケーション毎のレイアウトを覚えておく(_R)"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "標準レイアウト:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""
-"現在のキーボードレイアウトを表示、クリックでそのレイアウトを切り換えます。"
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr ""
+#~ "現在のキーボードレイアウトを表示、クリックでそのレイアウトを切り換えます。"

Modified: xfce4-xkb-plugin/trunk/po/pl.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/pl.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/pl.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-04-08 13:25+0900\n"
 "Last-Translator: Piotr Maliński <admin at rk.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -15,12 +15,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Przełącznik układów klawiatury"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -28,39 +28,42 @@
 "Umożliwia zmianę ustawień klawiatury\n"
 "oraz podaje obecne ustawienia"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Inne wtyczki dostępne tutaj"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Konfiguracja wtyczki"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Pokaż układ jako"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "grafika"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "tekst"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "wg. ustawień aplikacji"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "_Zapamiętaj ustawienia układów dla poszczególnych aplikacji"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Domyślny układ:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
-msgstr "Pokazuje obecny układ i zmienia go po kliknięciu"
+msgid "Button to switch the X keyboard layout"
+msgstr ""
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr "Pokazuje obecny układ i zmienia go po kliknięciu"

Modified: xfce4-xkb-plugin/trunk/po/ru.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/ru.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/ru.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-03-24 21:57+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev at gmail.com>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -15,12 +15,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "Раскладки клавиатуры"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -28,40 +28,43 @@
 "Позволяет переключать раскладку клавиатуры и \n"
 "отображает текщую раскладку"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "Другие доступные расширения"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "Параметры"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "Стиль отображения"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "картинка"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "текст"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "Дополнительно"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "Запоминать раскладку для каждого приложения"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "Раскладка по умолчанию:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""
-"Отображает текущую раскладку клавиатуры и позволяет переключать раскладки"
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr ""
+#~ "Отображает текущую раскладку клавиатуры и позволяет переключать раскладки"

Modified: xfce4-xkb-plugin/trunk/po/xfce4-xkb-plugin.pot
===================================================================
--- xfce4-xkb-plugin/trunk/po/xfce4-xkb-plugin.pot	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/xfce4-xkb-plugin.pot	2007-01-17 17:51:43 UTC (rev 2402)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,50 +16,49 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
-msgid "Per applcation settings"
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
+msgid "Per application settings"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr ""
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr ""
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
+msgid "Button to switch the X keyboard layout"
 msgstr ""

Modified: xfce4-xkb-plugin/trunk/po/zh_TW.po
===================================================================
--- xfce4-xkb-plugin/trunk/po/zh_TW.po	2007-01-17 17:50:04 UTC (rev 2401)
+++ xfce4-xkb-plugin/trunk/po/zh_TW.po	2007-01-17 17:51:43 UTC (rev 2402)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-17 13:26+0100\n"
 "PO-Revision-Date: 2006-07-28 23:49+0800\n"
 "Last-Translator: Cosmo Chene <cosmolax at gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -15,12 +15,12 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:169
+#: ../panel-plugin/xfce4-xkb-plugin.c:176
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard Layout Switcher"
 msgstr "切換鍵盤對應"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:175
+#: ../panel-plugin/xfce4-xkb-plugin.c:182
 msgid ""
 "Allows you to switch the keyboard layout and\n"
 "displays the currently selected layout."
@@ -28,39 +28,42 @@
 "讓您能夠切換別的鍵盤對應方式以及\n"
 "顯示目前所用的鍵盤類別."
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:180
+#: ../panel-plugin/xfce4-xkb-plugin.c:187
 msgid "Other plugins available here"
 msgstr "其他可用的外掛"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:412
+#: ../panel-plugin/xfce4-xkb-plugin.c:415
 msgid "Configure Keyboard Layout Switcher"
 msgstr "設定切換鍵盤對應"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:425
+#: ../panel-plugin/xfce4-xkb-plugin.c:428
 msgid "Show layout as"
 msgstr "顯示鍵盤對應的方式"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:440
+#: ../panel-plugin/xfce4-xkb-plugin.c:443
 msgid "image"
 msgstr "圖片"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:441
+#: ../panel-plugin/xfce4-xkb-plugin.c:444
 msgid "text"
 msgstr "文字"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:445
+#: ../panel-plugin/xfce4-xkb-plugin.c:448
 msgid "Per application settings"
 msgstr "針對每個程式作設定"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:459
+#: ../panel-plugin/xfce4-xkb-plugin.c:462
 msgid "_Remember layout for each application"
 msgstr "記住每個程式的設定(_R)"
 
-#: ../panel-plugin/xfce4-xkb-plugin.c:468
+#: ../panel-plugin/xfce4-xkb-plugin.c:471
 msgid "Default layout:"
 msgstr "預設鍵盤:"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid ""
-"Displays the current keyboard layout and switches the layout when clicked"
-msgstr "顯示目前使用的鍵盤類型,並讓您用滑鼠點選切換想用的鍵盤對應方式"
+msgid "Button to switch the X keyboard layout"
+msgstr ""
+
+#~ msgid ""
+#~ "Displays the current keyboard layout and switches the layout when clicked"
+#~ msgstr "顯示目前使用的鍵盤類型,並讓您用滑鼠點選切換想用的鍵盤對應方式"




More information about the Goodies-commits mailing list