diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c4f7c1b64ee8814eeb7cd21a43cde01279c69170..0000000000000000000000000000000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-configure.in
-depcomp
-install-sh
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-update
-intltool-update.in
-missing
-mkinstalldirs
-stamp-h1
-autom4te.cache
-*.swp
diff --git a/AUTHORS b/AUTHORS
index 682b236c023b120eee4f2c2d58130929f31f557f..ca114f82b1cee3ffafc3250068837ac0ef3de7f7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,2 @@
Eduard Roccatello <eduard@xfce.org>
Nick Schermer <nickschermer@gmail.com>
-Mike Massonnet <mmassonnet@xfce.org>
diff --git a/ChangeLog b/ChangeLog
index 78c1ca300b897f76901726710363e33a4996b498..d439af2d8204a2bbb0b19af3e1068ea8e8ccb0c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,129 +1,3 @@
-2008-01-25 Nick Schermer <nick@xfce.org>
-
- * README: Fix missing character ^_^.
-
-2008-01-25 Nick Schermer <nick@xfce.org>
-
- * panel-plugin/clipman.c: Fix missing include.
- * panel-plugin/Makefile.am: Some improvements.
- * README: Small improvement.
-
-2008-01-24 Mike Massonnet <mmassonnet@gmail.com>
-
- * panel-plugin/clipman.c(clipman_plugin_set_size): Scale pixbuf.
-
-2008-01-24 Mike Massonnet <mmassonnet@gmail.com>
-
- * panel-plugin/Makefile.am: Add stuff in INCLUDES
- * panel-plugin/clipman.c: Count padding of 2 (as done by other panel plugins)
- and correct the double xthickness to x/y.
-
-2008-01-14 Mike Massonnet <mmassonnet@gmail.com>
-
- * .gitignore: Add *.swp.
- * TODO: out of ideas. Deleted.
- * po/: update french translation, fix changelog.
-
-2008-01-14 Mike Massonnet <mmassonnet@gmail.com>
-
- * Add .gitignore files.
-
-2008-01-14 Mike Massonnet <mmassonnet@gmail.com>
-
- * panel-plugin/Makefile.am,
- panel-plugin/xfce4-popup-clipman.c,
- panel-plugin/xfce4-popup-clipman.h,
- panel-plugin/clipman.c: Add popup command.
-
-2008-01-14 Mike Massonnet <mmassonnet@gmail.com>
-
- * panel-plugin/clipman.c(clipman_plugin_button_pressed),
- panel-plugin/clipman.c(clipman_plugin_new),
- panel-plugin/clipman.c(clipman_plugin_menu_popup):
- Replace "button_press_event" against a "toggled" signal.
-
-2008-01-14 Mike Massonnet <mmassonnet@gmail.com>
-
- * panel-plugin/clipman.c(clipman_plugin_load_data),
- panel-plugin/clipman.c(clipman_plugin_save_data): Replace g_return_if_fail
- with return since it wouldn't be a bug in the application, but a end-user
- problem (file permission, ...).
- * panel-plugin/clipman.c(clipman_plugin_get_short_text): Replace the UTF-8
- ellipsis with "...".
- * panel-plugin/clipman.c(clipman_plugin_menu_insert_clip),
- panel-plugin/clipman.c(clipman_plugin_menu_item_activate),
- panel-plugin/clipman.c(clipman_plugin_menu_item_pressed): Set a gobject data
- with the pointer of the clip. Remove the g_slist_nth_data() calls.
-
-2008-01-09 Mike Massonnet <mmassonnet@gmail.com>
-
- * panel-plugin/clipman.h: Set save on exit by default.
- * panel-plugin/clipman.c: Three new functions _plugin_add_static/with_text,
- _plugin_delete, where the GUI code fits better. Remove _clips_add_static.
- * panel-plugin/clipman.c(clipman_plugin_load_data): Use DEFBEHAVIOUR
- instead of NORMAL.
- * panel-plugin/clipman.c(clipman_plugin_load_data),
- panel-plugin/clipman.c(clipman_plugin_save_data): Rename StaticClipboard
- to StaticClips. Delete rc group StaticClips before save.
- * panel-plugin/clipman.c(clipman_plugin_menu_item_pressed): Add button
- event 2 to copy to static clipboard. Move code for button event 3 in
- function _plugin_delete.
-
-2008-01-08 Mike Massonnet <mmassonnet@gmail.com>
-
- * po/*.po: make update-po.
- * po/fr.po: Update french translation.
-
-2008-01-08 Mike Massonnet <mmassonnet@gmail.com>
-
- * panel-plugin/clipman-dialogs.h: Move declarations inside clipman-dialogs.c.
- * panel-plugin/clipman-dialogs.c: Refine the dialog.
- * panel-plugin/clipman-dialogs.c, panel-plugin/clipman.c,
- panel-plugin/clipman.h: Add "static selection" option.
-
-2008-01-07 Mike Massonnet <mmassonnet@gmail.com>
-
- * Forget one clipman_clip_free replacement.
-
-2008-01-07 Mike Massonnet <mmassonnet@gmail.com>
-
- * Forget to clean short_text of static clipboard.
-
-2008-01-07 Mike Massonnet <mmassonnet@gmail.com>
-
- * Merge _clips_load_data inside _plugin_load_data.
- * Merge _clips_save_data inside _plugin_save_data.
- * Replace g_slist_length() > 0 with history != NULL.
- * Replace loop while (clip = _nth_data()) with for (list = history; list
- != NULL; list = list->next).
- * Add clipman_clip_new and clipman_clip_free.
- * Declare _clips_delete outside and use it in clipman-dialogs.c to free
- the overlap in the history.
-
-2008-01-06 Mike Massonnet <mmassonnet@gmail.com>
-
- * Extract code from _add_static to _add. Free ClipmanClip in _add if the
- clip exists. Set default value for Ignore Primary to FALSE.
-
-2008-01-06 Mike Massonnet <mmassonnet@gmail.com>
-
- * Save/load the static clipboard. Get rid of some TRACEs.
-
-2008-01-06 Mike Massonnet <mmassonnet@gmail.com>
-
- * Add static clipboard
-
-2008-01-06 Mike Massonnet <mmassonnet@gmail.com>
-
- * Remove more useless files in VCS.
-
-2008-01-05 Mike Massonnet <mmassonnet@xfce.org>
-
- * configure.in.in, panel-plugin/clipman.c, panel-plugin/clipman.h,
- panel-plugin/clipman-dialogs.c, panel-plugin/clipman-dialogs.h: Initial
- rewrite. Separate code between ClipmanPlugin and ClipmanClips. Use a
- GSList to store the history.
-
2006-01-17 Nick Schermer <nick@xfce.org>
* Improve configure files and Makefiles.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000000000000000000000000000000000000..54caf7c190f28df0279ade5fee3d43b108480a14
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/README b/README
index 4d85b0339a1580c36f7ecdf82848dd78ecdf4dce..b8b00638ba671d759729fa2ffac9ce9e3b30070a 100644
--- a/README
+++ b/README
@@ -1 +1 @@
-This is a simple clipboard history for Xfce Panel
+This is a simple cliboard history for XFCE4 Panel
diff --git a/TODO b/TODO
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/configure.in.in b/configure.in.in
index ffe2a8821f6b6b12017f1e564060bc269fe536e0..47170eb331c30b10fb54ca667f84de854d1dd040 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -60,10 +60,11 @@ XDT_I18N([@LINGUAS@])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
dnl ***********************************
dnl *** Check for debugging support ***
diff --git a/panel-plugin/.gitignore b/panel-plugin/.gitignore
deleted file mode 100644
index 6ae5a02bd2eb9e4648ad16d8462abdda1e5cf5f7..0000000000000000000000000000000000000000
--- a/panel-plugin/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-clipman.desktop
-xfce4-clipman-plugin
-xfce4-popup-clipman
-xfce4_clipman_plugin-clipman-dialogs.o
-xfce4_clipman_plugin-clipman.o
-xfce4_popup_clipman-xfce4-popup-clipman.o
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 83fa572be8358d3337ce83a4947140939ba64c4c..c2a00057fa8a47c54257d727bc559aac6121c7b8 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -2,32 +2,11 @@
INCLUDES = \
-I$(top_srcdir) \
- -DG_LOG_DOMAIN=\"xfce4-clipman-plugin\" \
+ -DG_LOG_DOMAIN=\"xfce4-battery-plugin\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
#
-# Clipman popup command
-#
-bin_PROGRAMS = \
- xfce4-popup-clipman
-
-xfce4_popup_clipman_SOURCES = \
- xfce4-popup-clipman.h \
- xfce4-popup-clipman.c
-
-xfce4_popup_clipman_CFLAGS = \
- $(LIBX11_CFLAGS) \
- $(GTK_CFLAGS)
-
-xfce4_popup_clipman_LDADD = \
- $(LIBX11_LIBS) \
- $(GTK_LIBS)
-
-xfce4_popup_clipman_LDFLAGS = \
- $(LIBX11_LDFLAGS)
-
-#
-# Clipman plugin
+# Battery Plugin
#
plugindir = \
$(libexecdir)/xfce4/panel-plugins
@@ -36,35 +15,29 @@ plugin_PROGRAMS = \
xfce4-clipman-plugin
xfce4_clipman_plugin_SOURCES = \
- clipman-dialogs.h \
- clipman-dialogs.c \
clipman.h \
- clipman.c
+ clipman.c \
+ clipman-dialogs.h \
+ clipman-dialogs.c
xfce4_clipman_plugin_CFLAGS = \
- $(LIBXFCE4PANEL_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS)
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4PANEL_CFLAGS)
xfce4_clipman_plugin_LDADD = \
$(LIBXFCE4PANEL_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
$(LIBXFCEGUI4_LIBS)
-
#
# Desktop file
#
+desktopdir = $(datadir)/xfce4/panel-plugins
desktop_in_in_files = clipman.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-# get full path into .desktop file
%.desktop.in: %.desktop.in.in
sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
$(desktop_in_in_files)
diff --git a/panel-plugin/clipman-dialogs.c b/panel-plugin/clipman-dialogs.c
index 53fed375c0ef08ee27f1c7ffdc8c1a8d6a330371..f80e00df873f4682d243c6cf01a2be0db1f858dc 100644
--- a/panel-plugin/clipman-dialogs.c
+++ b/panel-plugin/clipman-dialogs.c
@@ -1,7 +1,6 @@
-/* $Id: clipman-dialogs.c 2395 2007-01-17 17:42:53Z nick $
+/* $Id$
*
* Copyright (c) 2006-2007 Nick Schermer <nick@xfce.org>
- * Copyright (c) 2007 Mike Massonnet <mmassonnet@xfce.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,420 +21,351 @@
#include <config.h>
#endif
-#include "clipman.h"
-#include "clipman-dialogs.h"
+#include <string.h>
+#include <gtk/gtk.h>
+#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4panel/xfce-panel-plugin.h>
+#include "clipman.h"
+#include "clipman-dialogs.h"
#define PLUGIN_WEBSITE "http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-typedef struct _ClipmanOptions ClipmanOptions;
-
-struct _ClipmanOptions
+typedef struct
{
- ClipmanPlugin *clipman;
-
- GtkWidget *ExitSave;
- GtkWidget *PreventEmpty;
- GtkWidget *IgnoreSelection;
-
- GtkWidget *BehaviourNormal;
- GtkWidget *BehaviourStrictly;
-
- GtkWidget *ItemNumbers;
-
- GtkWidget *HistorySize;
- GtkWidget *ItemChars;
-
- GtkWidget *IgnoreStatic;
- GtkWidget *StaticDefault;
- GtkWidget *StaticPrimary;
- GtkWidget *StaticBoth;
-
-};
-
+ ClipmanPlugin *clipman;
+ GtkWidget *ExitSave;
+ GtkWidget *IgnoreSelection;
+ GtkWidget *PreventEmpty;
-static void clipman_configure_response (GtkWidget *dialog,
- gint response,
- ClipmanOptions *options);
-static void set_scale_to_spin (GtkWidget *scalewidget,
- GtkWidget *spinwidget);
-static void set_spin_to_scale (GtkWidget *spinwidget,
- GtkWidget *scalewidget);
-static void toggle_button (GtkWidget *button,
- ClipmanOptions *options);
+ GtkWidget *Behaviour;
+ GtkWidget *ItemNumbers;
+ GtkWidget *SeparateMenu;
-
-void
-clipman_configure_new (ClipmanPlugin *clipman_plugin)
-{
- GtkWidget *dialog, *dialog_vbox, *frame, *notebook, *notebook_vbox;
- GtkWidget *vbox, *hbox, *button, *label;
- ClipmanClips *clipman_clips = clipman_plugin->clipman_clips;
- ClipmanOptions *options;
- GSList *group;
-
- options = panel_slice_new0 (ClipmanOptions);
- options->clipman = clipman_plugin;
-
- dialog =
- xfce_titled_dialog_new_with_buttons (_("Clipboard Manager"),
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (clipman_plugin->panel_plugin))),
- GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_HELP, GTK_RESPONSE_HELP,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
- NULL);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PASTE);
- gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
- gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
- gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
- gtk_window_stick (GTK_WINDOW (dialog));
-
- dialog_vbox = GTK_DIALOG (dialog)->vbox;
-
- notebook = gtk_notebook_new ();
- gtk_box_pack_start (GTK_BOX (dialog_vbox), notebook, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (notebook), BORDER-2);
-
- /* === General === */
- notebook_vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_add (GTK_CONTAINER (notebook), notebook_vbox);
-
- gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (notebook),
- gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0),
- _("General"));
-
- /* General */
- vbox = gtk_vbox_new (FALSE, 2);
- frame = xfce_create_framebox_with_content (_("General"), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
-
- button = options->ExitSave =
- gtk_check_button_new_with_mnemonic (_("Save clipboard contents on _exit"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->save_on_exit);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- button = options->PreventEmpty =
- gtk_check_button_new_with_mnemonic (_("Pre_vent empty clipboard"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->prevent_empty);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- button = options->IgnoreSelection =
- gtk_check_button_new_with_mnemonic (_("_Ignore selections"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->ignore_primary);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- /* Behavior */
- vbox = gtk_vbox_new (FALSE, 2);
- frame = xfce_create_framebox_with_content (_("Clipboard Behavior"), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
-
- group = NULL;
-
- button = options->BehaviourNormal =
- gtk_radio_button_new_with_mnemonic (group, _("Normal clipboard _management"));
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), group);
- group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->behavior == NORMAL);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- button = options->BehaviourStrictly =
- gtk_radio_button_new_with_mnemonic (group, _("Strictly separate _both clipboards"));
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), group);
- group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->behavior == STRICTLY);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- /* === Appearance === */
- notebook_vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_add (GTK_CONTAINER (notebook), notebook_vbox);
-
- gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (notebook),
- gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1),
- _("Appearance"));
-
- /* Appearance */
- vbox = gtk_vbox_new (FALSE, 2);
- frame = xfce_create_framebox_with_content (_("Menu Appearance"), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
-
- button = options->ItemNumbers = gtk_check_button_new_with_mnemonic (_("_Show item numbers"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_plugin->menu_item_show_number);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- /* Numbers */
- vbox = gtk_vbox_new (FALSE, 2);
- frame = xfce_create_framebox_with_content (_("Numbers"), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
-
- /* History length */
- label = gtk_label_new (_("Clipboard history items:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
- button = options->HistorySize =
- gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (clipman_clips->history_length,
- MINHISTORY, MAXHISTORY, 1, 5, 0)));
- gtk_scale_set_draw_value (GTK_SCALE (button), FALSE);
- gtk_scale_set_digits (GTK_SCALE (button), 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 10);
-
- button = gtk_spin_button_new_with_range (MINHISTORY, MAXHISTORY, 1);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (button), clipman_clips->history_length);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
-
- g_signal_connect (G_OBJECT (options->HistorySize), "value_changed",
- G_CALLBACK (set_scale_to_spin), button);
- g_signal_connect (G_OBJECT (button), "value_changed",
- G_CALLBACK (set_spin_to_scale), options->HistorySize);
-
- /* Max menu item chars */
- label = gtk_label_new (_("Menu item characters:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
- button = options->ItemChars =
- gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (clipman_plugin->menu_item_max_chars,
- MINCHARS, MAXCHARS, 1, 5, 0)));
- gtk_scale_set_draw_value (GTK_SCALE (button), FALSE);
- gtk_scale_set_digits (GTK_SCALE (button), 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 10);
-
- button = gtk_spin_button_new_with_range (MINCHARS, MAXCHARS, 1);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (button), clipman_plugin->menu_item_max_chars);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
-
- g_signal_connect (G_OBJECT (options->ItemChars), "value_changed",
- G_CALLBACK (set_scale_to_spin), button);
- g_signal_connect (G_OBJECT (button), "value_changed",
- G_CALLBACK (set_spin_to_scale), options->ItemChars);
-
-
- /* === Static clipboard === */
- notebook_vbox = gtk_vbox_new (FALSE, 2);
- gtk_container_add (GTK_CONTAINER (notebook), notebook_vbox);
-
- gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (notebook),
- gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2),
- _("Static Clipboard"));
-
- /* General */
- vbox = gtk_vbox_new (FALSE, 2);
- frame = xfce_create_framebox_with_content (_("General"), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
-
- button = options->IgnoreStatic =
- gtk_check_button_new_with_mnemonic (_("Ignore _static clipboard"));
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->ignore_static_clipboard);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- /* Copy to clipboard */
- vbox = gtk_vbox_new (FALSE, 2);
- frame = xfce_create_framebox_with_content (_("Select to Clipboards"), vbox);
- gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER);
- gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
-
- group = NULL;
-
- button = options->StaticDefault =
- gtk_radio_button_new_with_mnemonic (group, _("Default"));
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), group);
- group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->static_selection == DEFAULT);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- button = options->StaticPrimary =
- gtk_radio_button_new_with_mnemonic (group, _("Selection"));
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), group);
- group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->static_selection == PRIMARY);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- button = options->StaticBoth =
- gtk_radio_button_new_with_mnemonic (group, _("Both"));
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), group);
- group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman_clips->static_selection == BOTH);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (G_OBJECT (button), "toggled",
- G_CALLBACK (toggle_button), options);
-
- /* Show the stuff */
- g_signal_connect (dialog, "response",
- G_CALLBACK (clipman_configure_response), options);
- xfce_panel_plugin_block_menu (clipman_plugin->panel_plugin);
- gtk_widget_show_all (dialog);
+ GtkWidget *HistorySize;
+ GtkWidget *ItemChars;
}
+ClipmanOptions;
static void
-clipman_configure_response (GtkWidget *dialog,
- gint response,
+clipman_configure_response (GtkWidget *dialog,
+ int response,
ClipmanOptions *options)
{
- gboolean result;
+ gboolean result;
- if (response == GTK_RESPONSE_HELP)
+ if (response == GTK_RESPONSE_HELP)
{
- /* show help */
- result = g_spawn_command_line_async ("exo-open --launch WebBrowser " PLUGIN_WEBSITE, NULL);
+ /* show help */
+ result = g_spawn_command_line_async ("exo-open --launch WebBrowser " PLUGIN_WEBSITE, NULL);
- if (G_UNLIKELY (result == FALSE))
- g_warning (_("Unable to open the following url: %s"), PLUGIN_WEBSITE);
+ if (G_UNLIKELY (result == FALSE))
+ g_warning (_("Unable to open the following url: %s"), PLUGIN_WEBSITE);
- return;
+ return;
}
- DBG("Destroy the dialog");
+ DBG("Destroy the dialog");
- /* History length */
- gint history_length = gtk_range_get_value (GTK_RANGE (options->HistorySize));
- if (options->clipman->clipman_clips->history_length != history_length)
- {
- options->clipman->clipman_clips->history_length = history_length;
-
- /* Free the overlap in the history */
- ClipmanClip *clip;
- gint length = g_slist_length (options->clipman->clipman_clips->history);
- while (history_length < length--)
- {
- clip = (ClipmanClip *)(g_slist_last (options->clipman->clipman_clips->history)->data);
- clipman_clips_delete (options->clipman->clipman_clips, clip);
- }
- }
+ g_object_set_data (G_OBJECT (options->clipman->plugin), "dialog", NULL);
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (options->Behaviour)))
+ options->clipman->Behaviour = NORMAL;
+ else
+ options->clipman->Behaviour = STRICTLY;
- /* Menu item max chars */
- gint max_chars = gtk_range_get_value (GTK_RANGE (options->HistorySize));
- if (options->clipman->menu_item_max_chars != max_chars)
+ if (options->clipman->HistoryItems != gtk_range_get_value (GTK_RANGE (options->HistorySize)))
{
- options->clipman->menu_item_max_chars = gtk_range_get_value (GTK_RANGE (options->ItemChars));
-
- /* Invalidate the old clip->short_text */
- GSList *list;
- ClipmanClip *clip;
- for (list = options->clipman->clipman_clips->history; list != NULL; list = list->next)
- {
- clip = (ClipmanClip *)list->data;
- g_free (clip->short_text);
- clip->short_text = NULL;
- }
- for (list = options->clipman->clipman_clips->static_clipboard; list != NULL; list = list->next)
- {
- clip = (ClipmanClip *)list->data;
- g_free (clip->short_text);
- clip->short_text = NULL;
- }
+ options->clipman->HistoryItems = gtk_range_get_value (GTK_RANGE (options->HistorySize));
+ clipman_check_array_len (options->clipman);
}
- xfce_panel_plugin_unblock_menu (options->clipman->panel_plugin);
- gtk_widget_destroy (dialog);
- panel_slice_free (ClipmanOptions, options);
+ options->clipman->MenuCharacters = gtk_range_get_value (GTK_RANGE (options->ItemChars));
+
+ clipman_save (options->clipman->plugin, options->clipman);
+
+ clipman_remove_selection_clips (options->clipman);
+
+ xfce_panel_plugin_unblock_menu (options->clipman->plugin);
+
+ gtk_widget_destroy (dialog);
+
+ panel_slice_free (ClipmanOptions, options);
}
static void
set_scale_to_spin (GtkWidget *scalewidget,
GtkWidget *spinwidget)
{
- guint value;
- value = gtk_range_get_value (GTK_RANGE (scalewidget));
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinwidget), value);
+ guint value;
+ value = gtk_range_get_value (GTK_RANGE (scalewidget));
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(spinwidget), value);
}
static void
set_spin_to_scale (GtkWidget *spinwidget,
GtkWidget *scalewidget)
{
- guint value;
- value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spinwidget));
- gtk_range_set_value (GTK_RANGE (scalewidget), value);
+ guint value;
+ value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(spinwidget));
+ gtk_range_set_value (GTK_RANGE (scalewidget), value);
}
static void
-toggle_button (GtkWidget *button,
+toggle_button (GtkWidget *button,
ClipmanOptions *options)
{
- ClipmanPlugin *clipman_plugin = options->clipman;
- ClipmanClips *clipman_clips = clipman_plugin->clipman_clips;
+ if (button == options->ExitSave)
+ options->clipman->ExitSave =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- if (button == options->ItemNumbers)
- clipman_plugin->menu_item_show_number =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ else if (button == options->IgnoreSelection)
+ {
+ options->clipman->IgnoreSelect =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- else if (button == options->ExitSave)
- clipman_clips->save_on_exit =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ if (options->clipman->IgnoreSelect)
+ gtk_widget_set_sensitive (options->SeparateMenu, FALSE);
+ else
+ gtk_widget_set_sensitive (options->SeparateMenu, TRUE);
+ }
+ else if (button == options->PreventEmpty)
+ options->clipman->PreventEmpty =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- else if (button == options->PreventEmpty)
- clipman_clips->prevent_empty =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ else if (button == options->ItemNumbers)
+ options->clipman->ItemNumbers =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- else if (button == options->IgnoreSelection)
- clipman_clips->ignore_primary =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ else if (button == options->SeparateMenu)
+ options->clipman->SeparateMenu =
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+}
- else if (button == options->IgnoreStatic)
- clipman_clips->ignore_static_clipboard =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+void
+clipman_configure (XfcePanelPlugin *plugin,
+ ClipmanPlugin *clipman)
+{
+ GtkWidget *dialog, *dialog_vbox, *frame, *button, *label;
+ GtkWidget *vbox, *hbox, *notebook_vbox, *notebook;
+ ClipmanOptions *options;
+ GSList *group;
- else if (button == options->BehaviourNormal)
- {
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
- clipman_clips->behavior = NORMAL;
- }
+ options = panel_slice_new0 (ClipmanOptions);
+ options->clipman = clipman;
- else if (button == options->BehaviourStrictly)
- {
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
- clipman_clips->behavior = STRICTLY;
- }
+ xfce_panel_plugin_block_menu (clipman->plugin);
- else if (button == options->StaticDefault)
- {
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
- clipman_clips->static_selection = DEFAULT;
- }
+ dialog = xfce_titled_dialog_new_with_buttons (_("Clipboard Manager"),
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ NULL);
- else if (button == options->StaticPrimary)
- {
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
- clipman_clips->static_selection = PRIMARY;
- }
+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-settings");
- else if (button == options->StaticBoth)
- {
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
- clipman_clips->static_selection = BOTH;
- }
+ g_object_set_data (G_OBJECT (clipman->plugin), "dialog", dialog);
-}
+ dialog_vbox = GTK_DIALOG (dialog)->vbox;
+
+ notebook = gtk_notebook_new ();
+ gtk_box_pack_start (GTK_BOX (dialog_vbox), notebook, FALSE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (notebook), BORDER-3);
+
+ notebook_vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (notebook), notebook_vbox);
+
+ /**
+ * The general frame
+ **/
+ frame = gtk_frame_new (NULL);
+ gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER-3);
+
+ vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (frame), vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
+
+ button = options->ExitSave = gtk_check_button_new_with_mnemonic (_("Save clipboard contents on _exit"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman->ExitSave);
+
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_button), options);
+ button = options->IgnoreSelection = gtk_check_button_new_with_mnemonic (_("_Ignore selections"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman->IgnoreSelect);
+
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_button), options);
+
+ button = options->PreventEmpty = gtk_check_button_new_with_mnemonic (_("Pre_vent empty clipboard"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman->PreventEmpty);
+
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_button), options);
+
+
+ label = gtk_label_new (_("<b>General</b>"));
+ gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label), 2, 0);
+
+ /**
+ * separate clipboards frame
+ **/
+ frame = gtk_frame_new (NULL);
+ gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER-3);
+
+ vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (frame), vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
+
+ group = NULL;
+
+ button = options->Behaviour = gtk_radio_button_new_with_mnemonic (group, _("Normal clipboard _management"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), group);
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+
+ if(clipman->Behaviour == NORMAL)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+
+ button = gtk_radio_button_new_with_mnemonic (group, _("Strictly separate _both clipboards"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (button), group);
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+
+ if(clipman->Behaviour == STRICTLY)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+
+ label = gtk_label_new (_("<b>Clipboard Behaviour</b>"));
+ gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label), 2, 0);
+
+ /**
+ * Notebook label
+ **/
+ label = gtk_label_new (_("General"));
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), label);
+
+ notebook_vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (notebook), notebook_vbox);
+
+ /**
+ * Menu appearance frame
+ **/
+ frame = gtk_frame_new (NULL);
+ gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER-3);
+
+ vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (frame), vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
+
+ button = options->ItemNumbers = gtk_check_button_new_with_mnemonic (_("_Show item numbers"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman->ItemNumbers);
+
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_button), options);
+
+ button = options->SeparateMenu = gtk_check_button_new_with_mnemonic (_("Se_parate clipboards"));
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clipman->SeparateMenu);
+
+ g_signal_connect (G_OBJECT (button), "toggled",
+ G_CALLBACK (toggle_button), options);
+
+ label = gtk_label_new (_("<b>Menu Appearance</b>"));
+ gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label), 2, 0);
+
+ /**
+ * Call some functions
+ **/
+
+ toggle_button (options->IgnoreSelection, options);
+
+ /**
+ * Numbers frame
+ **/
+ frame = gtk_frame_new (NULL);
+ gtk_box_pack_start (GTK_BOX (notebook_vbox), frame, FALSE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER-3);
+
+ vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (frame), vbox);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
+
+ label = gtk_label_new (_("Clipboard history items:"));
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+
+ button = options->HistorySize = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (clipman->HistoryItems, MINHISTORY, MAXHISTORY, 1, 5, 0)));
+ gtk_widget_show (button);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 10);
+ gtk_scale_set_draw_value (GTK_SCALE (button), FALSE);
+ gtk_scale_set_digits (GTK_SCALE (button), 0);
+
+ button = gtk_spin_button_new_with_range(MINHISTORY, MAXHISTORY, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(button), clipman->HistoryItems);
+
+ /* Sync history widgets */
+ g_signal_connect (G_OBJECT (options->HistorySize), "value_changed",
+ G_CALLBACK (set_scale_to_spin), button);
+
+ g_signal_connect (G_OBJECT (button), "value_changed",
+ G_CALLBACK (set_spin_to_scale), options->HistorySize);
+
+ label = gtk_label_new (_("Menu item characters:"));
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+
+ button = options->ItemChars = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (clipman->MenuCharacters, MINCHARS, MAXCHARS, 1, 5, 0)));
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 10);
+ gtk_scale_set_draw_value (GTK_SCALE (button), FALSE);
+ gtk_scale_set_digits (GTK_SCALE (button), 0);
+
+ button = gtk_spin_button_new_with_range(MINCHARS, MAXCHARS, 1);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(button), clipman->MenuCharacters);
+
+ g_signal_connect (G_OBJECT (options->ItemChars), "value_changed",
+ G_CALLBACK (set_scale_to_spin), button);
+
+ g_signal_connect (G_OBJECT (button), "value_changed",
+ G_CALLBACK (set_spin_to_scale), options->ItemChars);
+
+ label = gtk_label_new (_("<b>Numbers</b>"));
+ gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+
+ label = gtk_label_new (_("Appearance"));
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), label);
+
+ g_signal_connect(dialog, "response",
+ G_CALLBACK(clipman_configure_response), options);
+
+ gtk_widget_show_all (dialog);
+}
diff --git a/panel-plugin/clipman-dialogs.h b/panel-plugin/clipman-dialogs.h
index 0d8aa9143aa7546c644841ba4818581798ef7db5..1c60fe709390ab56f4a5c29d1781cdaf4b5257ac 100644
--- a/panel-plugin/clipman-dialogs.h
+++ b/panel-plugin/clipman-dialogs.h
@@ -1,7 +1,6 @@
-/* $Id: clipman-dialogs.h 2395 2007-01-17 17:42:53Z nick $
+/* $Id$
*
* Copyright (c) 2006-2007 Nick Schermer <nick@xfce.org>
- * Copyright (c) 2007 Mike Massonnet <mmassonnet@xfce.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,7 +23,7 @@
G_BEGIN_DECLS
void
-clipman_configure_new (ClipmanPlugin *clipman_plugin);
+clipman_configure (XfcePanelPlugin *plugin, ClipmanPlugin *clipman);
G_END_DECLS
diff --git a/panel-plugin/clipman.c b/panel-plugin/clipman.c
index 2fac8edbec71b8ad34ba707f4814003740325750..4e7d12805e9022bc5e095047e1e29dbb774254cf 100644
--- a/panel-plugin/clipman.c
+++ b/panel-plugin/clipman.c
@@ -1,7 +1,6 @@
/* $Id$
*
* Copyright (c) 2006-2007 Nick Schermer <nick@xfce.org>
- * Copyright (c) 2007 Mike Massonnet <mmassonnet@xfce.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,1133 +21,1091 @@
#include <config.h>
#endif
-#include <gdk/gdkx.h>
+#include <string.h>
+#include <gtk/gtk.h>
+
+#include <libxfcegui4/libxfcegui4.h>
#include <libxfce4util/libxfce4util.h>
+#include <libxfce4panel/xfce-panel-plugin.h>
#include <libxfce4panel/xfce-panel-convenience.h>
#include "clipman.h"
#include "clipman-dialogs.h"
-#include "xfce4-popup-clipman.h"
-
-
-
-static void clipman_plugin_register (XfcePanelPlugin *panel_plugin);
-
-static ClipmanPlugin * clipman_plugin_new (XfcePanelPlugin *panel_plugin);
-static void clipman_plugin_load_data (ClipmanPlugin *clipman_plugin);
+/* The clipboards */
+static GtkClipboard *primaryClip;
+static GtkClipboard *defaultClip;
-static void clipman_plugin_save_data (ClipmanPlugin *clipman_plugin);
+/* Register the plugin */
+static void
+clipman_construct (XfcePanelPlugin *plugin);
-static void clipman_plugin_free (ClipmanPlugin *clipman_plugin);
+XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (clipman_construct);
-static gboolean clipman_plugin_set_size (ClipmanPlugin *clipman_plugin,
- gint size);
-static gchar * clipman_plugin_get_short_text (ClipmanPlugin *clipman_plugin,
- const gchar *text);
-static void clipman_plugin_menu_new (ClipmanPlugin *clipman_plugin);
+static void
+clipman_free_clip (ClipmanClip *clip)
+{
+ g_free (clip->text);
+ g_free (clip->title);
-static void clipman_plugin_menu_insert_clip (ClipmanClip *clip,
- ClipmanPlugin *clipman_plugin);
-static void clipman_plugin_menu_popup (ClipmanPlugin *clipman_plugin);
+ panel_slice_free (ClipmanClip, clip);
-static void clipman_plugin_menu_position (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data);
-static void clipman_plugin_menu_destroy (ClipmanPlugin *clipman_plugin);
+ DBG ("Clip successfully freed");
+}
-static void clipman_plugin_menu_item_activate (GtkWidget *widget,
- ClipmanPlugin *clipman_plugin);
-static gboolean clipman_plugin_menu_item_pressed (GtkWidget *widget,
- GdkEventButton *event,
- ClipmanPlugin *clipman_plugin);
-static void clipman_plugin_add_static (ClipmanPlugin *clipman_plugin);
+static void
+clipman_destroy_menu (GtkWidget *menu,
+ ClipmanPlugin *clipman)
+{
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (clipman->button), FALSE);
-static void clipman_plugin_add_static_with_text (ClipmanPlugin *clipman_plugin,
- const gchar *text);
-static void clipman_plugin_delete (ClipmanPlugin *clipman_plugin,
- ClipmanClip *clip);
-static gboolean clipman_plugin_message_received (ClipmanPlugin *clipman_plugin,
- GdkEventClient *ev);
-static gboolean clipman_plugin_set_selection (ClipmanPlugin *clipman_plugin);
+ gtk_widget_destroy (menu);
+ DBG ("Menu Destroyed");
+}
+static gboolean
+clipman_clear (GtkWidget *mi,
+ GdkEventButton *ev,
+ ClipmanPlugin *clipman)
+{
+ ClipmanClip *clip;
+ if (xfce_confirm (_("Are you sure you want to clear the history?"),
+ "gtk-yes",
+ NULL))
+ {
+ gtk_clipboard_clear (primaryClip);
+ gtk_clipboard_clear (defaultClip);
-static ClipmanClips * clipman_clips_new (ClipmanPlugin *clipman_plugin);
+ while (clipman->clips->len > 0)
+ {
+ clip = g_ptr_array_index (clipman->clips, 0);
+ g_ptr_array_remove (clipman->clips, clip);
+ clipman_free_clip (clip);
+ }
+ }
-static void clipman_clips_clear_history (ClipmanClips *clipman_clips);
+ /* 'Save' the empty clipboard */
+ clipman_save (clipman->plugin, clipman);
-static void clipman_clips_restore_empty (ClipmanClips *clipman_clips,
- ClipboardType type);
-static gboolean clipman_clips_check_clipboard (ClipmanClips *clipman_clips);
+ return FALSE;
+}
-static void clipman_clips_add (ClipmanClips *clipman_clips,
- gchar *text,
- ClipboardType type);
-static gint clipman_clips_compare (ClipmanClip *one,
- ClipmanClip *two);
-static gint clipman_clips_compare_with_type (ClipmanClip *one,
- ClipmanClip *two);
+void
+clipman_check_array_len (ClipmanPlugin *clipman)
+{
+ ClipmanClip *clip;
+ DBG ("Checking Array Length");
+ while (clipman->clips->len > clipman->HistoryItems)
+ {
+ clip = g_ptr_array_index (clipman->clips, 0);
+ g_ptr_array_remove (clipman->clips, clip);
+ clipman_free_clip (clip);
-static ClipmanClip * clipman_clip_new (gchar *text, ClipboardType type);
+ DBG("A clip have been removed");
+ }
+}
-static void clipman_clip_free (ClipmanClip *clip);
+static gchar *
+clipman_create_title (gchar *txt,
+ gint length)
+{
+ gchar *s, *t, *u, *buf;
+ gint i;
+ /* rough string copy */
+ s = g_strndup (txt, length*8 + 8);
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (clipman_plugin_register);
+ if (G_UNLIKELY (!s))
+ return NULL;
-static void
-clipman_plugin_register (XfcePanelPlugin *panel_plugin)
-{
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
- ClipmanPlugin *clipman_plugin = clipman_plugin_new (panel_plugin);
- g_return_if_fail (G_LIKELY (NULL != clipman_plugin));
-
- g_signal_connect_swapped (panel_plugin,
- "save",
- G_CALLBACK (clipman_plugin_save_data),
- clipman_plugin);
- g_signal_connect_swapped (panel_plugin,
- "free-data",
- G_CALLBACK (clipman_plugin_free),
- clipman_plugin);
- g_signal_connect_swapped (panel_plugin,
- "size-changed",
- G_CALLBACK (clipman_plugin_set_size),
- clipman_plugin);
- g_signal_connect_swapped (panel_plugin,
- "configure-plugin",
- G_CALLBACK (clipman_configure_new),
- clipman_plugin);
-
- xfce_panel_plugin_menu_show_configure (panel_plugin);
- xfce_panel_plugin_add_action_widget (panel_plugin, clipman_plugin->button);
- clipman_plugin_set_selection (clipman_plugin);
-
- gtk_widget_show_all (clipman_plugin->button);
-}
+ if (!g_utf8_validate (s, -1, NULL))
+ {
+ DBG ("Title is not utf8 complaint, we're going to convert it");
-static ClipmanPlugin *
-clipman_plugin_new (XfcePanelPlugin *panel_plugin)
-{
- ClipmanPlugin *clipman_plugin = g_slice_new0 (ClipmanPlugin);
- clipman_plugin->panel_plugin = panel_plugin;
- clipman_plugin->clipman_clips = clipman_clips_new (clipman_plugin);
+ u = g_locale_to_utf8 (s, -1, NULL, NULL, NULL);
+ g_free (s);
+ s = u;
- clipman_plugin->button = xfce_create_panel_toggle_button ();
- clipman_plugin->icon = gtk_image_new ();
+ /* Check the title again */
+ if (!g_utf8_validate (s, -1, NULL))
+ {
+ DBG ("Title is still not utf8 complaint, we going to drop this clip");
+ g_free (s);
+ return NULL;
+ }
+ }
- gtk_container_add (GTK_CONTAINER (clipman_plugin->button), clipman_plugin->icon);
- gtk_container_add (GTK_CONTAINER (panel_plugin), clipman_plugin->button);
+ /* create string length */
+ buf = g_malloc(length*6); /* max length of utf8 char is 6 */
+ g_utf8_strncpy (buf, s, length);
+ g_free (s);
+ s = buf;
- g_signal_connect_swapped (clipman_plugin->button,
- "toggled",
- G_CALLBACK (clipman_plugin_menu_popup),
- clipman_plugin);
+ /* remove tabs and newlines */
+ /* this works when the string is utf8-valid */
+ i = 0;
+ while (s[i] != '\0')
+ {
+ if (s[i] == '\n' || s[i] == '\r' || s[i] == '\t')
+ s[i] = ' ';
+ i++;
+ }
- clipman_plugin_load_data (clipman_plugin);
+ /* remove html characters */
+ t = g_markup_escape_text (s, -1);
+ g_free (s);
- return clipman_plugin;
+ return t;
}
-static void
-clipman_plugin_load_data (ClipmanPlugin *clipman_plugin)
+void
+clipman_remove_selection_clips (ClipmanPlugin *clipman)
{
- XfceRc *rc;
- gchar *file;
- gint length;
- ClipmanClips *clipman_clips = clipman_plugin->clipman_clips;
-
- file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "xfce4/panel/clipman.rc", TRUE);
- if (G_UNLIKELY (NULL == file))
- return;
- rc = xfce_rc_simple_open (file, FALSE);
- g_free (file);
-
- xfce_rc_set_group (rc, "Properties");
-
- clipman_plugin->menu_item_show_number = xfce_rc_read_bool_entry (rc, "ItemNumbers", DEFITEMNUMBERS);
-
- length = xfce_rc_read_int_entry (rc, "MenuCharacters", DEFCHARS);
- if (length > MAXCHARS)
- length = MAXCHARS;
- else if (length < MINCHARS)
- length = MINCHARS;
- clipman_plugin->menu_item_max_chars = length;
-
- clipman_clips->behavior = xfce_rc_read_int_entry (rc, "Behaviour", DEFBEHAVIOUR);
- clipman_clips->save_on_exit = xfce_rc_read_bool_entry (rc, "ExitSave", DEFEXITSAVE);
- clipman_clips->prevent_empty = xfce_rc_read_bool_entry (rc, "PreventEmpty", DEFPREVENTEMPTY);
- clipman_clips->ignore_primary = xfce_rc_read_bool_entry (rc, "IgnoreSelect", DEFIGNORESELECT);
- clipman_clips->ignore_static_clipboard = xfce_rc_read_bool_entry (rc, "IgnoreStatic", DEFIGNORESTATIC);
- clipman_clips->static_selection = xfce_rc_read_int_entry (rc, "StaticSelection", PRIMARY);
-
- length = xfce_rc_read_int_entry (rc, "HistoryItems", DEFHISTORY);
- if (length > MAXHISTORY)
- length = MAXHISTORY;
- else if (length < MINHISTORY)
- length = MINHISTORY;
- clipman_clips->history_length = length;
-
- xfce_rc_set_group (rc, "Clips");
-
- gchar name[13];
- gint n = sizeof (name);
- gchar *text = NULL; /* We use this allocation so no free() */
- ClipboardType type;
-
- length = xfce_rc_read_int_entry (rc, "ClipsLen", 0);
- if (length > MAXHISTORY)
- length = MAXHISTORY;
- if (length > 0 && clipman_clips->save_on_exit)
- {
- DBG ("Restoring the clipboard");
+ ClipmanClip *clip;
+ guint i;
- while (length-- > 0)
- {
- g_snprintf (name, n, "clip_%d_text", length);
- text = g_strdup (xfce_rc_read_entry (rc, name, ""));
- g_snprintf (name, n, "clip_%d_from", length);
- type = (ClipboardType)xfce_rc_read_int_entry (rc, name, 0);
- clipman_clips_add (clipman_clips, text, type);
- }
- }
+ if (!clipman->IgnoreSelect)
+ return;
- xfce_rc_set_group (rc, "StaticClips");
+ DBG ("Cleaning up all selection clips");
- length = xfce_rc_read_int_entry (rc, "ClipsLen", 0);
- if (length > 0)
+ for (i = clipman->clips->len; i--; )
{
- DBG ("Restoring the static clipboard");
+ clip = g_ptr_array_index (clipman->clips, i);
- while (length-- > 0)
+ if (clip->fromtype == PRIMARY)
{
- g_snprintf (name, n, "clip_%d_text", length);
- text = g_strdup (xfce_rc_read_entry (rc, name, ""));
- clipman_clips_add (clipman_clips, text, STATIC);
+ g_ptr_array_remove (clipman->clips, clip);
+ clipman_free_clip (clip);
}
}
-
- xfce_rc_close (rc);
}
static void
-clipman_plugin_save_data (ClipmanPlugin *clipman_plugin)
+clipman_add_clip (ClipmanPlugin *clipman,
+ gchar *txt,
+ ClipboardType type)
{
- ClipmanClips *clipman_clips = clipman_plugin->clipman_clips;
- XfceRc *rc;
- gchar *file;
-
- file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "xfce4/panel/clipman.rc", TRUE);
- if (G_UNLIKELY (NULL == file))
- return;
- rc = xfce_rc_simple_open (file, FALSE);
- g_free (file);
-
- xfce_rc_set_group (rc, "Properties");
-
- xfce_rc_write_bool_entry (rc, "ItemNumbers", clipman_plugin->menu_item_show_number);
- xfce_rc_write_int_entry (rc, "MenuCharacters", clipman_plugin->menu_item_max_chars);
-
- xfce_rc_write_bool_entry (rc, "ExitSave", clipman_clips->save_on_exit);
- xfce_rc_write_int_entry (rc, "Behaviour", clipman_clips->behavior);
- xfce_rc_write_int_entry (rc, "HistoryItems", clipman_clips->history_length);
- xfce_rc_write_bool_entry (rc, "PreventEmpty", clipman_clips->prevent_empty);
- xfce_rc_write_bool_entry (rc, "IgnoreSelect", clipman_clips->ignore_primary);
- xfce_rc_write_bool_entry (rc, "IgnoreStatic", clipman_clips->ignore_static_clipboard);
- xfce_rc_write_int_entry (rc, "StaticSelection", clipman_clips->static_selection);
-
- GSList *list;
- ClipmanClip *clip;
- gint i;
- gchar name[13];
- gint n = sizeof (name);
-
- xfce_rc_delete_group (rc, "Clips", TRUE);
- if (clipman_clips->save_on_exit && G_LIKELY (NULL != clipman_clips->history))
+ ClipmanClip *new_clip;
+
+ if (G_LIKELY (txt != NULL) &&
+ G_LIKELY (strcmp (txt, "")))
{
- DBG ("Saving the clipboard history");
+ new_clip = panel_slice_new0 (ClipmanClip);
- xfce_rc_set_group (rc, "Clips");
- xfce_rc_write_int_entry (rc, "ClipsLen", g_slist_length (clipman_clips->history));
+ new_clip->title = clipman_create_title (txt,
+ clipman->MenuCharacters);
- for (i = 0, list = clipman_clips->history; list != NULL; list = list->next, i++)
- {
- clip = (ClipmanClip *)list->data;
- g_snprintf (name, n, "clip_%d_text", i);
- xfce_rc_write_entry (rc, name, clip->text);
- g_snprintf (name, n, "clip_%d_from", i);
- xfce_rc_write_int_entry (rc, name, clip->type);
- }
- }
+ /* No valid title could be created, drop it... */
+ if (new_clip->title == NULL)
+ {
+ g_free (new_clip);
+ return;
+ }
- xfce_rc_delete_group (rc, "StaticClips", TRUE);
- if (G_LIKELY (NULL != clipman_clips->static_clipboard))
- {
- DBG ("Saving the static clipboard");
+ new_clip->text = g_strdup (txt);
+ new_clip->fromtype = type;
- xfce_rc_set_group (rc, "StaticClips");
- xfce_rc_write_int_entry (rc, "ClipsLen", g_slist_length (clipman_clips->static_clipboard));
+ g_ptr_array_add (clipman->clips, new_clip);
- for (i = 0, list = clipman_clips->history; list != NULL; list = list->next, i++)
- {
- clip = (ClipmanClip *)list->data;
- g_snprintf (name, n, "clip_%d_text", i);
- xfce_rc_write_entry (rc, name, clip->text);
- }
+ DBG("Added clip %d of %d", clipman->clips->len, clipman->HistoryItems);
}
-
- xfce_rc_close (rc);
-}
-
-static void
-clipman_plugin_free (ClipmanPlugin *clipman_plugin)
-{
- /* There are no resources to free that won't be after we quit the plugin */
- gtk_main_quit ();
}
static gboolean
-clipman_plugin_set_size (ClipmanPlugin *clipman_plugin,
- gint size)
+clipman_exists (ClipmanPlugin *clipman,
+ gchar *txt,
+ ClipboardType type)
{
- gtk_widget_set_size_request (GTK_WIDGET (clipman_plugin->panel_plugin), size, size);
- size -= 2 + 2 * MAX (clipman_plugin->button->style->xthickness,
- clipman_plugin->button->style->ythickness);
+ guint i;
+ ClipmanClip *clip;
- GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
- GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (icon_theme, GTK_STOCK_PASTE, size, 0, NULL);
- GdkPixbuf *scaled = gdk_pixbuf_scale_simple (pixbuf, size, size, GDK_INTERP_BILINEAR);
- g_object_unref (G_OBJECT (pixbuf));
- pixbuf = scaled;
+ /* Walk through the array backwards, because
+ * if the text exists, this will probably be the newest */
- if (G_UNLIKELY (NULL == pixbuf))
+ for (i = clipman->clips->len; i--; )
{
- gtk_image_clear (GTK_IMAGE (clipman_plugin->icon));
- return FALSE;
- }
-
- gtk_image_set_from_pixbuf (GTK_IMAGE (clipman_plugin->icon), pixbuf);
- g_object_unref (G_OBJECT (pixbuf));
-
- return TRUE;
-}
+ clip = g_ptr_array_index (clipman->clips, i);
-static gchar *
-clipman_plugin_get_short_text (ClipmanPlugin *clipman_plugin,
- const gchar *text)
-{
- gchar *short_text, *tmp = NULL;
- const gchar *offset;
- gint max_length;
-
- g_return_val_if_fail (G_LIKELY (NULL != text), NULL);
- g_return_val_if_fail (G_LIKELY (g_utf8_validate (text, -1, NULL)), NULL);
+ if (G_LIKELY ((clip->text != NULL) &&
+ (strcmp(clip->text, txt) == 0))
+ )
+ {
+ switch (clipman->Behaviour)
+ {
+ case NORMAL:
+ if (type == DEFAULT &&
+ clip->fromtype == PRIMARY)
+ clip->fromtype = DEFAULT;
- short_text = g_strstrip (g_strdup (text));
+ return TRUE;
- /* Shorten */
- max_length = clipman_plugin->menu_item_max_chars;
- if (g_utf8_strlen (short_text, -1) > max_length)
- {
- offset = g_utf8_offset_to_pointer (short_text, max_length);
- tmp = g_strndup (short_text, offset - short_text);
- g_free (short_text);
+ case STRICTLY:
+ if (type == clip->fromtype)
+ return TRUE;
- short_text = g_strconcat (tmp, "...", NULL); /* Ellipsis */
- g_free (tmp);
+ return FALSE;
+ }
+ }
}
- /* Cleanup */
- tmp = g_strdelimit (short_text, "\n\r\t", ' ');
- short_text = g_markup_escape_text (tmp, -1);
- g_free (tmp);
-
- return short_text;
+ return FALSE;
}
-static void
-clipman_plugin_menu_new (ClipmanPlugin *clipman_plugin)
+static gboolean
+clipman_item_clicked (GtkWidget *mi,
+ GdkEventButton *ev,
+ ClipmanAction *action)
{
- GtkWidget *mi;
-
- clipman_plugin->menu = gtk_menu_new ();
+ gchar *dtext, *ptext;
- /* Add clipboard entries */
- if (G_LIKELY (NULL != clipman_plugin->clipman_clips->history))
- g_slist_foreach (clipman_plugin->clipman_clips->history,
- (GFunc)clipman_plugin_menu_insert_clip,
- clipman_plugin);
- else
+ if (ev->button == 1 && action->clipman->Behaviour == STRICTLY)
{
- mi = gtk_menu_item_new_with_label (_("< Clipboard Empty >"));
- gtk_widget_set_sensitive (mi, FALSE);
- gtk_menu_shell_prepend (GTK_MENU_SHELL (clipman_plugin->menu), mi);
+ DBG("Clip copied to his own clipboard (STRICTLY)");
+
+ if (action->clip->fromtype == DEFAULT)
+ {
+ gtk_clipboard_clear (defaultClip);
+ gtk_clipboard_set_text (defaultClip, action->clip->text, -1);
+ }
+
+ if (action->clip->fromtype == PRIMARY)
+ {
+ gtk_clipboard_clear (primaryClip);
+ gtk_clipboard_set_text (primaryClip, action->clip->text, -1);
+ }
}
-
- if (!clipman_plugin->clipman_clips->ignore_static_clipboard)
+ else if (ev->button == 1)
+ {
+ gtk_clipboard_clear (defaultClip);
+ gtk_clipboard_set_text (defaultClip, action->clip->text, -1);
+ DBG ("Clip copied to default clipboard");
+
+ if (!action->clipman->IgnoreSelect)
+ {
+ gtk_clipboard_clear (primaryClip);
+ gtk_clipboard_set_text (primaryClip, action->clip->text, -1);
+ DBG ("Clip copied to primary clipboard");
+ }
+ }
+ else if (ev->button == 3)
{
- /* Prepend static clipboard */
- mi = gtk_separator_menu_item_new ();
- gtk_menu_shell_prepend (GTK_MENU_SHELL (clipman_plugin->menu), mi);
-
- if (NULL != clipman_plugin->clipman_clips->static_clipboard)
- g_slist_foreach (clipman_plugin->clipman_clips->static_clipboard,
- (GFunc)clipman_plugin_menu_insert_clip,
- clipman_plugin);
- else
+ if (xfce_confirm (_("Are you sure you want to remove this clip from the history?"),
+ "gtk-yes", NULL))
{
- mi = gtk_menu_item_new_with_label (_("< Static Clipboard Empty >"));
- gtk_widget_set_sensitive (mi, FALSE);
- gtk_menu_shell_prepend (GTK_MENU_SHELL (clipman_plugin->menu), mi);
+ DBG ("Removed the selected clip from the History");
+
+ dtext = gtk_clipboard_wait_for_text (defaultClip);
+ if (dtext && !strcmp(dtext, action->clip->text))
+ {
+ gtk_clipboard_clear (defaultClip);
+ gtk_clipboard_set_text (defaultClip, "", -1);
+ }
+ g_free (dtext);
+
+ ptext = gtk_clipboard_wait_for_text (primaryClip);
+ if (ptext && !strcmp(ptext, action->clip->text))
+ {
+ gtk_clipboard_clear (primaryClip);
+ gtk_clipboard_set_text (primaryClip, "", -1);
+ }
+ g_free (ptext);
+
+ g_ptr_array_remove (action->clipman->clips, action->clip);
+ clipman_free_clip (action->clip);
}
+ }
- /* Append add to static clipboard */
- mi = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (clipman_plugin->menu), mi);
+ panel_slice_free (ClipmanAction, action);
- mi = gtk_menu_item_new_with_label (_("Add static clipboard"));
- gtk_menu_shell_append (GTK_MENU_SHELL (clipman_plugin->menu), mi);
- g_signal_connect_swapped (mi,
- "activate",
- G_CALLBACK (clipman_plugin_add_static),
- clipman_plugin);
+ return FALSE;
+}
+
+static GtkWidget *
+clipman_create_menuitem (ClipmanAction *action,
+ guint width,
+ guint number,
+ gboolean bold)
+{
+ GtkWidget *mi, *label;
+ gchar *title, *string_num;
+
+ if (action->clipman->ItemNumbers)
+ {
+ if (number < 10)
+ string_num = g_strdup_printf("<tt><span size=\"smaller\">%d. </span></tt> ", number);
+ else
+ string_num = g_strdup_printf("<tt><span size=\"smaller\">%d.</span></tt> ", number);
}
- else
+ else
{
- mi = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (clipman_plugin->menu), mi);
-
+ string_num = g_strdup ("");
}
- /* Prepend title */
- mi = gtk_separator_menu_item_new ();
- gtk_menu_shell_prepend (GTK_MENU_SHELL (clipman_plugin->menu), mi);
-
- mi = gtk_menu_item_new_with_label ("");
- gchar *title = g_strdup_printf ("<b>%s</b>", _("Clipman History"));
- gtk_label_set_markup (GTK_LABEL (GTK_BIN (mi)->child), title);
- gtk_widget_set_sensitive (mi, FALSE);
- gtk_menu_shell_prepend (GTK_MENU_SHELL (clipman_plugin->menu), mi);
-
- /* Append clear history */
- mi = gtk_menu_item_new_with_label (_("Clear History"));
- gtk_menu_shell_append (GTK_MENU_SHELL (clipman_plugin->menu), mi);
- g_signal_connect_swapped (mi,
- "activate",
- G_CALLBACK (clipman_clips_clear_history),
- clipman_plugin->clipman_clips);
-
- /* Do the rest */
- g_signal_connect_swapped (clipman_plugin->menu,
- "deactivate",
- G_CALLBACK (clipman_plugin_menu_destroy),
- clipman_plugin);
-
- gtk_menu_attach_to_widget (GTK_MENU (clipman_plugin->menu),
- clipman_plugin->button,
- NULL);
- xfce_panel_plugin_register_menu (clipman_plugin->panel_plugin,
- GTK_MENU (clipman_plugin->menu));
-
- gtk_widget_show_all (clipman_plugin->menu);
+ if (bold)
+ title = g_strdup_printf("%s<b>%s</b>", string_num, action->clip->title);
+ else
+ title = g_strdup_printf("%s%s", string_num, action->clip->title);
+
+ g_free (string_num);
+
+
+ label = gtk_label_new (title);
+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+ gtk_label_set_single_line_mode (GTK_LABEL (label), TRUE);
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_label_set_max_width_chars (GTK_LABEL (label), width);
+
+ g_free (title);
+
+ mi = gtk_menu_item_new ();
+ gtk_container_add (GTK_CONTAINER (mi), label);
+ gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), mi);
+ gtk_widget_show (label);
+
+ return mi;
}
static void
-clipman_plugin_menu_insert_clip (ClipmanClip *clip,
- ClipmanPlugin *clipman_plugin)
+clipman_clicked_separated (GtkWidget *menu,
+ ClipmanPlugin *clipman)
{
- static gint i = 0, j = 0;
- static ClipmanClip *clip_default = NULL, *clip_primary = NULL, *clip_last = NULL;
- static gboolean clip_default_found = FALSE, clip_primary_found = FALSE;
- gchar *text = NULL, *bold = NULL;
- gint a = -1, b = -1;
- GtkWidget *mi;
+ gchar *ptext, *dtext;
+ guint i, j;
+ ClipmanAction *action = NULL;
+ ClipmanClip *clip;
+ GtkWidget *mi;
- g_return_if_fail (G_LIKELY (NULL != clip));
+ /* Default Clips */
+ dtext = gtk_clipboard_wait_for_text (defaultClip);
+ j = 0;
- /* Get current clipboards */
- if (clip->type != STATIC && G_UNLIKELY (NULL == clip_default))
+ for (i = clipman->clips->len; i--; )
{
- /* The allocation of text is used as-is in clipman_clip_new() */
- text = gtk_clipboard_wait_for_text (clipman_plugin->clipman_clips->default_clipboard);
- clip_default = clipman_clip_new (text, DEFAULT);
- if (G_UNLIKELY (NULL == clip_default->text))
- clip_default->text = g_strdup ("");
-
- text = gtk_clipboard_wait_for_text (clipman_plugin->clipman_clips->primary_clipboard);
- clip_primary = clipman_clip_new (text, PRIMARY);
- if (G_UNLIKELY (NULL == clip_primary->text))
- clip_primary->text = g_strdup ("");
- }
-
- /* Get the last clip */
- if (G_UNLIKELY (NULL == clip_last))
- {
- if (clip->type == STATIC)
- clip_last = (ClipmanClip *)(g_slist_last (clipman_plugin->clipman_clips->static_clipboard)->data);
- else
- clip_last = (ClipmanClip *)(g_slist_last (clipman_plugin->clipman_clips->history)->data);
- }
+ clip = g_ptr_array_index (clipman->clips, i);
- /* Generate a short text */
- if (G_UNLIKELY (NULL == clip->short_text))
- clip->short_text = clipman_plugin_get_short_text (clipman_plugin, clip->text);
-
- /* Generate the menu item text */
- if (clipman_plugin->menu_item_show_number && clipman_plugin->clipman_clips->behavior == STRICTLY)
- text = g_strdup_printf ("%d. %s", (clip->type == PRIMARY) ? i+1 : j+1, clip->short_text);
- else if (clipman_plugin->menu_item_show_number)
- text = g_strdup_printf ("%d. %s", i+1, clip->short_text);
- else
- text = g_strdup (clip->short_text);
-
- /* Check if the clip matches the clipboards to set the text in bold */
- if ((clip->type == DEFAULT && !clip_default_found) ||
- (clip->type == PRIMARY && !clip_primary_found))
- {
- switch (clipman_plugin->clipman_clips->behavior)
+ if (clip->fromtype == DEFAULT)
{
- case STRICTLY:
- /* Check with default clipboard */
- a = clipman_clips_compare_with_type (clip, clip_default);
- if (a == 0)
- clip_default_found = TRUE;
- /* Check with primary clipboard */
- else
+ j++;
+
+ action = panel_slice_new0 (ClipmanAction);
+ action->clipman = clipman;
+ action->clip = clip;
+
+ if (dtext != NULL &&
+ G_LIKELY (clip->text != NULL) &&
+ strcmp(clip->text, dtext) == 0)
{
- b = clipman_clips_compare_with_type (clip, clip_primary);
- if (b == 0)
- clip_primary_found = TRUE;
+ mi = clipman_create_menuitem (action, clipman->MenuCharacters,
+ j, TRUE);
+ g_free (dtext);
+ dtext = NULL;
+ }
+ else
+ {
+ mi = clipman_create_menuitem (action, clipman->MenuCharacters,
+ j, FALSE);
}
- break;
- default:
- case NORMAL:
- a = clipman_clips_compare (clip, clip_default);
- if (a != 0)
- b = clipman_clips_compare (clip, clip_primary);
- if (a == 0 || b == 0)
- clip_default_found = clip_primary_found = TRUE;
- break;
- }
+ g_signal_connect (G_OBJECT(mi), "button_release_event",
+ G_CALLBACK(clipman_item_clicked), action);
- /* Set text in bold */
- if (a == 0 || b == 0)
- {
- bold = g_strconcat ("<b>", text, "</b>", NULL);
- g_free (text);
- text = bold;
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
}
}
- /* Create the menu item */
- mi = gtk_menu_item_new_with_label ("");
- gtk_label_set_markup (GTK_LABEL (GTK_BIN (mi)->child), text);
- g_free (text);
-
- g_object_set_data (G_OBJECT (mi), "clip", clip);
-
- /* Connect signals */
- g_signal_connect (mi,
- "activate",
- G_CALLBACK (clipman_plugin_menu_item_activate),
- clipman_plugin);
- g_signal_connect (mi,
- "button_press_event",
- G_CALLBACK (clipman_plugin_menu_item_pressed),
- clipman_plugin);
-
- /* Insert in the menu */
- switch (clip->type)
+ g_free (dtext);
+
+ if (j == 0)
{
- case STATIC:
- gtk_menu_shell_prepend (GTK_MENU_SHELL (clipman_plugin->menu), mi);
- i++;
- break;
-
- case DEFAULT:
- case PRIMARY:
- default:
- switch (clipman_plugin->clipman_clips->behavior)
+ mi = gtk_menu_item_new_with_label (_("< Default History Empty >"));
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ }
+
+ /* Primairy Clips */
+ mi = gtk_separator_menu_item_new ();
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+ ptext = gtk_clipboard_wait_for_text (primaryClip);
+ j = 0;
+
+ for (i = clipman->clips->len; i--; )
+ {
+ clip = g_ptr_array_index (clipman->clips, i);
+
+ if (clip->fromtype == PRIMARY)
{
- case STRICTLY:
- /* Insert primary clipboard before default clipboard */
- if (clip->type == PRIMARY && !clipman_plugin->clipman_clips->ignore_primary)
+ j++;
+
+ action = panel_slice_new0 (ClipmanAction);
+ action->clipman = clipman;
+ action->clip = clip;
+
+ if (ptext != NULL &&
+ G_LIKELY (clip->text != NULL) &&
+ strcmp(clip->text, ptext) == 0)
{
- gtk_menu_shell_insert (GTK_MENU_SHELL (clipman_plugin->menu), mi, i);
- i++;
+ mi = clipman_create_menuitem (action, clipman->MenuCharacters,
+ j, TRUE);
+ g_free (ptext);
+ ptext = NULL;
}
- /* Append default clipboard */
- else
+ else
{
- gtk_menu_shell_append (GTK_MENU_SHELL (clipman_plugin->menu), mi);
- j++;
+ mi = clipman_create_menuitem (action, clipman->MenuCharacters,
+ j, FALSE);
}
- break;
- default:
- case NORMAL:
- /* Append */
- gtk_menu_shell_append (GTK_MENU_SHELL (clipman_plugin->menu), mi);
- i++;
- break;
+ g_signal_connect (G_OBJECT(mi), "button_release_event",
+ G_CALLBACK(clipman_item_clicked), action);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
}
- break;
}
- /* Check if the clip matches the last clip */
- if (clip == clip_last)
- {
- if (clip->type != STATIC && clipman_plugin->clipman_clips->behavior == STRICTLY)
- {
- /* Add separators and check for empty clipboards */
- if (!clipman_plugin->clipman_clips->ignore_primary)
- {
- if (i == 0)
- {
- mi = gtk_menu_item_new_with_label (_("< Selection History Empty >"));
- gtk_widget_set_sensitive (mi, FALSE);
- gtk_menu_shell_insert (GTK_MENU_SHELL (clipman_plugin->menu), mi, i++);
- }
+ g_free (ptext);
- mi = gtk_separator_menu_item_new ();
- gtk_menu_shell_insert (GTK_MENU_SHELL (clipman_plugin->menu), mi, i);
- }
+ if (j == 0)
+ {
+ mi = gtk_menu_item_new_with_label (_("< Selection History Empty >"));
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ }
- if (j == 0)
- {
- mi = gtk_menu_item_new_with_label (_("< Default History Empty >"));
- gtk_widget_set_sensitive (mi, FALSE);
- gtk_menu_shell_append (GTK_MENU_SHELL (clipman_plugin->menu), mi);
- }
- }
+ mi = gtk_separator_menu_item_new ();
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- /* Free memory */
- if (NULL != clip_default)
- clipman_clip_free (clip_default);
- if (NULL != clip_primary)
- clipman_clip_free (clip_primary);
+ mi = gtk_menu_item_new_with_label (_("Clear History"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- /* Unset static variables */
- clip_default = clip_primary = clip_last = NULL;
- clip_default_found = clip_primary_found = FALSE;
- i = j = 0;
- }
+ g_signal_connect (G_OBJECT (mi), "button_release_event",
+ G_CALLBACK (clipman_clear), clipman);
}
static void
-clipman_plugin_menu_popup (ClipmanPlugin *clipman_plugin)
+clipman_clicked_not_separated (GtkWidget *menu,
+ ClipmanPlugin *clipman)
{
- gint rc = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (clipman_plugin->button));
- if (rc == FALSE)
- return;
-
- clipman_plugin_menu_new (clipman_plugin);
- gtk_menu_popup (GTK_MENU (clipman_plugin->menu),
- NULL,
- NULL,
- (GtkMenuPositionFunc)clipman_plugin_menu_position,
- clipman_plugin->panel_plugin,
- 0,
- gtk_get_current_event_time ());
-}
+ gchar *ptext, *dtext;
+ guint i;
+ ClipmanAction *action = NULL;
+ ClipmanClip *clip;
+ GtkWidget *mi;
-static void
-clipman_plugin_menu_position (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
-{
- XfcePanelPlugin *panel_plugin = user_data;
- GtkWidget *button;
- GtkRequisition requisition;
- GtkOrientation orientation;
-
- g_return_if_fail (GTK_IS_MENU (menu));
- button = gtk_menu_get_attach_widget (menu);
- g_return_if_fail (GTK_IS_WIDGET (button));
-
- orientation = xfce_panel_plugin_get_orientation (panel_plugin);
- gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
- gdk_window_get_origin (button->window, x, y);
-
- switch (orientation)
+ ptext = gtk_clipboard_wait_for_text (primaryClip);
+ dtext = gtk_clipboard_wait_for_text (defaultClip);
+
+ for (i = clipman->clips->len; i--;)
{
- case GTK_ORIENTATION_HORIZONTAL:
- if (*y + button->allocation.height + requisition.height > gdk_screen_height ())
- /* Show menu above */
- *y -= requisition.height;
- else
- /* Show menu below */
- *y += button->allocation.height;
-
- if (*x + requisition.width > gdk_screen_width ())
- /* Adjust horizontal position */
- *x = gdk_screen_width () - requisition.width;
- break;
-
- case GTK_ORIENTATION_VERTICAL:
- if (*x + button->allocation.width + requisition.width > gdk_screen_width ())
- /* Show menu on the right */
- *x -= requisition.width;
- else
- /* Show menu on the left */
- *x += button->allocation.width;
-
- if (*y + requisition.height > gdk_screen_height ())
- /* Adjust vertical position */
- *y = gdk_screen_height () - requisition.height;
- break;
-
- default:
- break;
+ clip = g_ptr_array_index (clipman->clips, i);
+
+ action = panel_slice_new0 (ClipmanAction);
+ action->clipman = clipman;
+ action->clip = clip;
+
+ if (dtext != NULL &&
+ G_LIKELY (clip->text != NULL) &&
+ strcmp(clip->text, dtext) == 0)
+ {
+ mi = clipman_create_menuitem (action, clipman->MenuCharacters,
+ clipman->clips->len-i, TRUE);
+ g_free (dtext);
+ dtext = NULL;
+ }
+ else if (ptext != NULL &&
+ G_LIKELY (clip->text != NULL) &&
+ strcmp(clip->text, ptext) == 0)
+ {
+ mi = clipman_create_menuitem (action, clipman->MenuCharacters,
+ clipman->clips->len-i, TRUE);
+ g_free (ptext);
+ ptext = NULL;
+ }
+ else
+ {
+ mi = clipman_create_menuitem (action, clipman->MenuCharacters,
+ clipman->clips->len-i, FALSE);
+ }
+
+ g_signal_connect (G_OBJECT(mi), "button_release_event",
+ G_CALLBACK(clipman_item_clicked), action);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
}
-}
-static void
-clipman_plugin_menu_destroy (ClipmanPlugin *clipman_plugin)
-{
- if (G_LIKELY (GTK_IS_MENU (clipman_plugin->menu)))
- gtk_menu_detach (GTK_MENU (clipman_plugin->menu));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (clipman_plugin->button), FALSE);
+ g_free (ptext);
+ g_free (dtext);
+
+ mi = gtk_separator_menu_item_new ();
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+ mi = gtk_menu_item_new_with_label (_("Clear History"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+ g_signal_connect (G_OBJECT (mi), "button_release_event",
+ G_CALLBACK (clipman_clear), clipman);
}
static void
-clipman_plugin_menu_item_activate (GtkWidget *widget,
- ClipmanPlugin *clipman_plugin)
+clipman_position_menu (GtkMenu *menu,
+ int *x,
+ int *y,
+ gboolean *push_in,
+ ClipmanPlugin *clipman)
{
- g_return_if_fail (G_LIKELY (GTK_IS_WIDGET (widget)));
- ClipmanClip *clip = g_object_get_data (G_OBJECT (widget), "clip");
- g_return_if_fail (G_LIKELY (NULL != clip));
+ GtkRequisition req;
+ GdkScreen *screen;
+ GdkRectangle geom;
+ gint num;
+
+ gtk_widget_size_request (GTK_WIDGET (menu), &req);
- /* Copy the clip to the clipboard */
- if (clip->type != STATIC && clipman_plugin->clipman_clips->behavior == STRICTLY)
+ gdk_window_get_origin (GTK_WIDGET (clipman->plugin)->window, x, y);
+
+ switch (xfce_panel_plugin_get_screen_position(clipman->plugin))
{
- if (clip->type == PRIMARY)
- gtk_clipboard_set_text (clipman_plugin->clipman_clips->primary_clipboard, clip->text, -1);
- else
- gtk_clipboard_set_text (clipman_plugin->clipman_clips->default_clipboard, clip->text, -1);
+ case XFCE_SCREEN_POSITION_SW_H:
+ case XFCE_SCREEN_POSITION_S:
+ case XFCE_SCREEN_POSITION_SE_H:
+ DBG("Bottom");
+ *y -= req.height;
+ break;
+
+ case XFCE_SCREEN_POSITION_NW_H:
+ case XFCE_SCREEN_POSITION_N:
+ case XFCE_SCREEN_POSITION_NE_H:
+ DBG("Top");
+ *y += clipman->button->allocation.height;
+ break;
+
+ case XFCE_SCREEN_POSITION_NW_V:
+ case XFCE_SCREEN_POSITION_W:
+ case XFCE_SCREEN_POSITION_SW_V:
+ DBG("Left");
+ *x += clipman->button->allocation.width;
+ *y += clipman->button->allocation.height - req.height;
+ break;
+
+ case XFCE_SCREEN_POSITION_NE_V:
+ case XFCE_SCREEN_POSITION_E:
+ case XFCE_SCREEN_POSITION_SE_V:
+ DBG("Right");
+ *x -= req.width;
+ *y += clipman->button->allocation.height - req.height;
+ break;
+
+ case XFCE_SCREEN_POSITION_FLOATING_H:
+ case XFCE_SCREEN_POSITION_FLOATING_V:
+ case XFCE_SCREEN_POSITION_NONE:
+ DBG("Floating");
+ gdk_display_get_pointer(gtk_widget_get_display(GTK_WIDGET(clipman->plugin)),
+ NULL, x, y, NULL);
}
- /* Copy the static clip to the clipboard */
- else
- {
- StaticSelection static_selection = clipman_plugin->clipman_clips->static_selection;
- if (static_selection == DEFAULT || static_selection == BOTH)
- gtk_clipboard_set_text (clipman_plugin->clipman_clips->default_clipboard, clip->text, -1);
+ screen = gtk_widget_get_screen (clipman->button);
+ num = gdk_screen_get_monitor_at_window (screen, clipman->button->window);
+ gdk_screen_get_monitor_geometry (screen, num, &geom);
- if (static_selection == PRIMARY || static_selection == BOTH)
- gtk_clipboard_set_text (clipman_plugin->clipman_clips->primary_clipboard, clip->text, -1);
- }
+ if (*x > geom.x + geom.width - req.width)
+ *x = geom.x + geom.width - req.width;
+ if (*x < geom.x)
+ *x = geom.x;
+
+ if (*y > geom.y + geom.height - req.height)
+ *y = geom.y + geom.height - req.height;
+ if (*y < geom.y)
+ *y = geom.y;
}
static gboolean
-clipman_plugin_menu_item_pressed (GtkWidget *widget,
- GdkEventButton *event,
- ClipmanPlugin *clipman_plugin)
+clipman_clicked (GtkWidget *button,
+ GdkEventButton *ev,
+ ClipmanPlugin *clipman)
{
- if (event->button != 3 && event->button != 2)
- return FALSE;
+ GtkWidget *mi;
+ GtkWidget *menu;
+ gchar *title;
- g_return_val_if_fail (G_LIKELY (GTK_IS_WIDGET (widget)), FALSE);
- ClipmanClip *clip = g_object_get_data (G_OBJECT (widget), "clip");
- g_return_val_if_fail (G_LIKELY (NULL != clip), FALSE);
+ if (ev->button != 1)
+ return FALSE;
- /* Copy clip to static clipboard */
- if (event->button == 2)
- clipman_plugin_add_static_with_text (clipman_plugin, clip->text);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (clipman->button), TRUE);
- /* Delete item */
- else if (event->button == 3)
- clipman_plugin_delete (clipman_plugin, clip);
+ menu = gtk_menu_new ();
- return TRUE;
-}
+ title = g_strdup_printf("<span weight=\"bold\">%s</span>", _("Clipman History"));
+ mi = gtk_menu_item_new_with_label ("");
+ gtk_label_set_markup(GTK_LABEL(GTK_BIN(mi)->child), title);
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-static void
-clipman_plugin_add_static (ClipmanPlugin *clipman_plugin)
-{
- clipman_plugin_add_static_with_text (clipman_plugin, NULL);
-}
+ mi = gtk_separator_menu_item_new ();
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-static void
-clipman_plugin_add_static_with_text (ClipmanPlugin *clipman_plugin,
- const gchar *text)
-{
- /* Dialog */
- GtkWidget *dialog =
- gtk_dialog_new_with_buttons (_("Add static clipboard"),
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (clipman_plugin->panel_plugin))),
- GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_ADD, GTK_RESPONSE_OK,
- NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
- gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PASTE);
- gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 110);
-
- /* Box */
- GtkWidget *vbox = GTK_DIALOG (dialog)->vbox;
-
- /* Scrolled window */
- GtkWidget *scrolledwin = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwin), GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (vbox), scrolledwin);
-
- /* Entry */
- GtkWidget *entry = gtk_text_view_new ();
- GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
- gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (entry), FALSE);
- if (NULL != text)
- gtk_text_buffer_set_text (buffer, text, -1);
- gtk_container_add (GTK_CONTAINER (scrolledwin), entry);
-
- /* Containers */
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 4);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
-
- /* Run the dialog */
- gtk_widget_show_all (vbox);
- gint result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_hide (dialog);
-
- if (G_LIKELY (result == GTK_RESPONSE_OK && gtk_text_buffer_get_char_count (buffer) > 0))
+ if (clipman->SeparateMenu &&
+ !clipman->IgnoreSelect &&
+ G_LIKELY (clipman->clips->len > 0))
+ {
+ clipman_clicked_separated (menu, clipman);
+ }
+ else if (G_LIKELY (clipman->clips->len > 0))
+ {
+ clipman_clicked_not_separated (menu, clipman);
+ }
+ else
{
- /* Add static clipboard */
- GtkTextIter start, end;
- gtk_text_buffer_get_bounds (buffer, &start, &end);
- gchar *text_dup = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (buffer), &start, &end, TRUE);
- clipman_clips_add (clipman_plugin->clipman_clips, text_dup, STATIC);
+ mi = gtk_menu_item_new_with_label (_("< Clipboard Empty >"));
+ gtk_widget_set_sensitive (mi, FALSE);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
}
- /* Destroy the dialog */
- gtk_widget_destroy (dialog);
+ gtk_widget_show_all (menu);
+
+ /* Also destroy the menu items when nothing is clicked */
+ g_signal_connect (G_OBJECT(menu), "deactivate",
+ G_CALLBACK(clipman_destroy_menu), clipman);
+
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+ (GtkMenuPositionFunc) clipman_position_menu,
+ clipman, 0,
+ gtk_get_current_event_time ());
+
+ return TRUE;
}
static void
-clipman_plugin_delete (ClipmanPlugin *clipman_plugin,
- ClipmanClip *clip)
+clipman_restore_empty (ClipmanPlugin *clipman,
+ ClipboardType type)
{
- GtkWidget *dialog =
- gtk_message_dialog_new (NULL,
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
- _("Are you sure you want to remove this clip from the history?"));
- gint result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- if (G_UNLIKELY (result != GTK_RESPONSE_YES))
- return;
-
- DBG ("Delete `%s' from clipboard (%d)", clip->text, clip->type);
-
- /* The activate signal comes before button-press-event, therefore we must
- * free the clipboards so the activate signal will not add a new item */
- ClipmanClips *clipman_clips = clipman_plugin->clipman_clips;
- if (clip->type != STATIC)
+ guint i;
+ ClipmanClip *clip;
+
+ if (clipman->Behaviour == STRICTLY &&
+ G_LIKELY (clipman->clips->len > 0))
{
- switch (clipman_clips->behavior)
+ /* Walk through the array till a clip of it's own
+ * type is found, then past it in the clipboard */
+ for (i = clipman->clips->len; i--;)
{
- case STRICTLY:
- if (clip->type == PRIMARY)
- gtk_clipboard_set_text (clipman_clips->primary_clipboard, "", -1);
- else
- gtk_clipboard_set_text (clipman_clips->default_clipboard, "", -1);
+ clip = g_ptr_array_index (clipman->clips, i);
- default:
- case NORMAL:
- gtk_clipboard_set_text (clipman_clips->default_clipboard, "", -1);
- gtk_clipboard_set_text (clipman_clips->primary_clipboard, "", -1);
- break;
+ if (clip->fromtype == type)
+ {
+ switch (type)
+ {
+ case PRIMARY:
+ gtk_clipboard_set_text(primaryClip, clip->text, -1);
+ break;
+ case DEFAULT:
+ gtk_clipboard_set_text(defaultClip, clip->text, -1);
+ break;
+ }
+
+ DBG("Clipboard restored with a clip from same type");
+
+ break;
+ }
}
}
+ else if (clipman->clips->len > 0)
+ {
+ /* Grap the latest clip and paste it in the clipboard */
+ clip = g_ptr_array_index (clipman->clips, (clipman->clips->len-1));
- clipman_clips_delete (clipman_clips, clip);
+ switch (type)
+ {
+ case PRIMARY:
+ gtk_clipboard_set_text(primaryClip, clip->text, -1);
+ break;
+ case DEFAULT:
+ gtk_clipboard_set_text(defaultClip, clip->text, -1);
+ break;
+ }
+
+ DBG("Last clip added");
+ }
}
static gboolean
-clipman_plugin_message_received (ClipmanPlugin *clipman_plugin,
- GdkEventClient *ev)
+clipman_check (ClipmanPlugin *clipman)
{
- DBG ("Message received");
- if (G_LIKELY (ev->data_format == 8 && *(ev->data.b) != '\0'))
+ gchar *ptext = NULL, *dtext;
+ GdkModifierType state;
+
+ /* We ignore the selection clipboard entirely if you've activated this in the options dialog */
+ if (!clipman->IgnoreSelect)
{
- if (!g_ascii_strcasecmp (XFCE_CLIPMAN_MESSAGE, ev->data.b))
+ /* Get mouse button information */
+ gdk_window_get_pointer(NULL, NULL, NULL, &state);
+
+ ptext = gtk_clipboard_wait_for_text (primaryClip);
+
+ if (clipman->PreventEmpty && ptext == NULL)
+ {
+ clipman_restore_empty (clipman, PRIMARY);
+ }
+ else if (ptext != NULL &&
+ !(state & GDK_BUTTON1_MASK) &&
+ !clipman_exists (clipman, ptext, PRIMARY))
{
- DBG ("`%s'", ev->data.b);
- xfce_panel_plugin_set_panel_hidden (clipman_plugin->panel_plugin, FALSE);
- while (gtk_events_pending ())
- gtk_main_iteration ();
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (clipman_plugin->button), TRUE);
- return TRUE;
+ DBG("Item added from primary clipboard");
+ clipman_add_clip (clipman, ptext, PRIMARY);
+ clipman_check_array_len (clipman);
}
+
+ g_free (ptext);
}
- return FALSE;
-}
-static gboolean
-clipman_plugin_set_selection (ClipmanPlugin *clipman_plugin)
-{
- GdkScreen *gscreen;
- gchar *selection_name;
- Atom selection_atom;
- GtkWidget *win;
- Window id;
-
- win = gtk_invisible_new ();
- gtk_widget_realize (win);
- id = GDK_WINDOW_XID (GTK_WIDGET (win)->window);
-
- gscreen = gtk_widget_get_screen (win);
- selection_name = g_strdup_printf (XFCE_CLIPMAN_SELECTION"%d",
- gdk_screen_get_number (gscreen));
- selection_atom = XInternAtom (GDK_DISPLAY (), selection_name, FALSE);
-
- if (XGetSelectionOwner (GDK_DISPLAY (), selection_atom))
+ dtext = gtk_clipboard_wait_for_text (defaultClip);
+
+ /* Check default clipboard */
+ if (clipman->PreventEmpty && dtext == NULL)
{
- gtk_widget_destroy (win);
- return FALSE;
+ clipman_restore_empty (clipman, DEFAULT);
+ }
+ else if (G_LIKELY (dtext != NULL) &&
+ !clipman_exists (clipman, dtext, DEFAULT))
+ {
+ DBG("Item added from default clipboard");
+ clipman_add_clip (clipman, dtext, DEFAULT);
+ clipman_check_array_len (clipman);
}
- XSelectInput (GDK_DISPLAY (), id, PropertyChangeMask);
- XSetSelectionOwner (GDK_DISPLAY (), selection_atom, id, GDK_CURRENT_TIME);
+ g_free (dtext);
- g_signal_connect_swapped (win, "client-event",
- G_CALLBACK (clipman_plugin_message_received),
- clipman_plugin);
+ return TRUE;
+}
- return TRUE;
+static void
+clipman_reset_timeout (ClipmanPlugin *clipman)
+{
+ if (!(clipman->killTimeout))
+ {
+ if (clipman->TimeoutId != 0)
+ g_source_remove (clipman->TimeoutId);
+
+ clipman->TimeoutId = g_timeout_add_full (G_PRIORITY_LOW,
+ TIMER_INTERVAL,
+ (GSourceFunc) clipman_check,
+ clipman,
+ (GDestroyNotify) clipman_reset_timeout);
+ }
}
+void
+clipman_save (XfcePanelPlugin *plugin,
+ ClipmanPlugin *clipman)
+{
+ XfceRc *rc;
+ gchar *file;
+ guint i;
+ gchar name[13];
+ ClipmanClip *clip;
+ DBG("Saving clipman settings");
-static ClipmanClips *
-clipman_clips_new (ClipmanPlugin *clipman_plugin)
-{
- ClipmanClips *clipman_clips = g_slice_new0 (ClipmanClips);
+ file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "xfce4/panel/clipman.rc", TRUE);
- clipman_clips->clipman_plugin = clipman_plugin;
+ if (G_UNLIKELY (!file))
+ return;
- clipman_clips->default_clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- clipman_clips->primary_clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+ rc = xfce_rc_simple_open (file, FALSE);
+ g_free (file);
- clipman_clips->history = NULL;
- clipman_clips->static_clipboard = NULL;
+ /* Save the preferences */
+ xfce_rc_set_group (rc, "Properties");
- clipman_clips->timeout =
- g_timeout_add_full (G_PRIORITY_LOW,
- TIMER_INTERVAL,
- (GSourceFunc)clipman_clips_check_clipboard,
- clipman_clips,
- (GDestroyNotify)NULL);
+ xfce_rc_write_bool_entry (rc, "ExitSave", clipman->ExitSave);
+ xfce_rc_write_bool_entry (rc, "IgnoreSelect", clipman->IgnoreSelect);
+ xfce_rc_write_bool_entry (rc, "PreventEmpty", clipman->PreventEmpty);
- return clipman_clips;
-}
+ switch (clipman->Behaviour)
+ {
+ case NORMAL:
+ xfce_rc_write_int_entry (rc, "Behaviour", 1);
+ break;
+ case STRICTLY:
+ xfce_rc_write_int_entry (rc, "Behaviour", 2);
+ break;
+ }
-static void
-clipman_clips_clear_history (ClipmanClips *clipman_clips)
-{
- GSList *list;
-
- GtkWidget *dialog =
- gtk_message_dialog_new (NULL,
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
- _("Are you sure you want to clear the history?"));
- gint result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- if (G_UNLIKELY (result != GTK_RESPONSE_YES))
- return;
-
- for (list = clipman_clips->history; list != NULL; list = list->next)
- clipman_clip_free ((ClipmanClip *)list->data);
- g_slist_free (list);
-
- clipman_clips->history = NULL;
-
- gtk_clipboard_set_text (clipman_clips->default_clipboard, "", -1);
- gtk_clipboard_set_text (clipman_clips->primary_clipboard, "", -1);
-}
+ xfce_rc_write_bool_entry (rc, "ItemNumbers", clipman->ItemNumbers);
+ xfce_rc_write_bool_entry (rc, "SeparateMenu", clipman->SeparateMenu);
-static void
-clipman_clips_restore_empty (ClipmanClips *clipman_clips,
- ClipboardType type)
-{
- if (G_UNLIKELY (NULL == clipman_clips->history))
- return;
+ xfce_rc_write_int_entry (rc, "HistoryItems", clipman->HistoryItems);
+ xfce_rc_write_int_entry (rc, "MenuCharacters", clipman->MenuCharacters);
- GSList *list = clipman_clips->history;
- ClipmanClip *clip = (ClipmanClip *)list->data;
+ /* Remove old content and create a new one */
+ xfce_rc_delete_group (rc, "Clips", TRUE );
- switch (clipman_clips->behavior)
+ if (clipman->ExitSave &&
+ clipman->clips->len > 0
+ )
{
- case STRICTLY:
- while (clip->type != type)
+ DBG("Saving the clipboard history");
+
+ xfce_rc_set_group (rc, "Clips");
+ xfce_rc_write_int_entry (rc, "ClipsLen", clipman->clips->len);
+
+ for (i = 0; i < clipman->clips->len; ++i)
{
- list = list->next;
- if (G_UNLIKELY (NULL == list))
- return;
- clip = (ClipmanClip *)list->data;
- }
+ clip = g_ptr_array_index (clipman->clips, i);
+
+ g_snprintf (name, 13, "clip_%d_text", i);
+ xfce_rc_write_entry (rc, name, clip->text);
- if (type == DEFAULT)
- gtk_clipboard_set_text (clipman_clips->default_clipboard, clip->text, -1);
- else if (!clipman_clips->ignore_primary)
- gtk_clipboard_set_text (clipman_clips->primary_clipboard, clip->text, -1);
- break;
-
- default:
- case NORMAL:
- gtk_clipboard_set_text (clipman_clips->default_clipboard, clip->text, -1);
- if (!clipman_clips->ignore_primary)
- gtk_clipboard_set_text (clipman_clips->primary_clipboard, clip->text, -1);
- break;
+ g_snprintf (name, 13, "clip_%d_from", i);
+ if (clip->fromtype == PRIMARY)
+ xfce_rc_write_int_entry (rc, name, 0);
+ else
+ xfce_rc_write_int_entry (rc, name, 1);
+ }
}
- DBG ("Restore clipboard to `%s'", clip->text);
+ xfce_rc_close (rc);
}
-static gboolean
-clipman_clips_check_clipboard (ClipmanClips *clipman_clips)
+static void
+clipman_read (ClipmanPlugin *clipman)
{
- GdkModifierType state;
- gchar *text; /* We use the new allocation of
- * gtk_clipboard_wait_for_text,
- * so no free() on that beotche */
-
- /* Default clipboard */
- text = gtk_clipboard_wait_for_text (clipman_clips->default_clipboard);
- if (G_LIKELY (NULL != text))
- clipman_clips_add (clipman_clips, text, DEFAULT);
- else if (clipman_clips->prevent_empty == TRUE)
- clipman_clips_restore_empty (clipman_clips, DEFAULT);
-
- /* Primary clipboard */
- if (!clipman_clips->ignore_primary)
+ XfceRc *rc;
+ gchar *file, *value;
+ guint type, i, clipslen;
+ gchar name[13];
+
+ /* Because Clipman is unique, we use 1 config file */
+ /*
+ file = xfce_panel_plugin_save_location (clipman->plugin, FALSE);
+ DBG("Read from file: %s", file);
+ */
+
+ file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "xfce4/panel/clipman.rc", TRUE);
+
+ if (G_UNLIKELY (!file))
+ return;
+
+ rc = xfce_rc_simple_open (file, FALSE);
+ g_free (file);
+
+ xfce_rc_set_group (rc, "Properties");
+
+ clipman->ExitSave = xfce_rc_read_bool_entry (rc, "ExitSave", DEFEXITSAVE);
+ clipman->IgnoreSelect = xfce_rc_read_bool_entry (rc, "IgnoreSelect", DEFIGNORESELECT);
+ clipman->PreventEmpty = xfce_rc_read_bool_entry (rc, "PreventEmpty", DEFPREVENTEMPTY);
+
+ switch (xfce_rc_read_int_entry (rc, "Behaviour", DEFBEHAVIOUR))
{
- gdk_window_get_pointer (NULL, NULL, NULL, &state);
- if (state & GDK_BUTTON1_MASK)
- return TRUE;
-
- text = gtk_clipboard_wait_for_text (clipman_clips->primary_clipboard);
- if (G_LIKELY (NULL != text))
- clipman_clips_add (clipman_clips, text, PRIMARY);
- else if (clipman_clips->prevent_empty == TRUE)
- clipman_clips_restore_empty (clipman_clips, PRIMARY);
+ case 1:
+ clipman->Behaviour = NORMAL;
+ DBG ("Behaviour = NORMAL");
+ break;
+ case 2:
+ clipman->Behaviour = STRICTLY;
+ DBG ("Behaviour = STRICTLY");
+ break;
+ }
+
+ clipman->ItemNumbers = xfce_rc_read_bool_entry (rc, "ItemNumbers", DEFITEMNUMBERS);
+ clipman->SeparateMenu = xfce_rc_read_bool_entry (rc, "SeparateMenu", DEFSEPMENU);
+
+ clipman->HistoryItems = xfce_rc_read_int_entry (rc, "HistoryItems", DEFHISTORY);
+ clipman->MenuCharacters = xfce_rc_read_int_entry (rc, "MenuCharacters", DEFCHARS);
+
+ if (clipman->HistoryItems > MAXHISTORY)
+ clipman->HistoryItems = MAXHISTORY;
+ if (clipman->HistoryItems < MINHISTORY)
+ clipman->HistoryItems = MINHISTORY;
+
+ if (clipman->MenuCharacters > MAXCHARS)
+ clipman->MenuCharacters = MAXCHARS;
+ if (clipman->MenuCharacters < MINCHARS)
+ clipman->MenuCharacters = MINCHARS;
+
+ xfce_rc_set_group (rc, "Clips");
+ clipslen = xfce_rc_read_int_entry (rc, "ClipsLen", 0);
+
+ if (clipslen > MAXHISTORY)
+ clipslen = MAXHISTORY;
+
+ if (clipman->ExitSave &&
+ clipslen > 0
+ )
+ {
+ DBG("Restoring the clipboard");
+
+ for (i = 0; i < clipslen; ++i)
+ {
+ g_snprintf (name, 13, "clip_%d_text", i);
+ value = g_strdup (xfce_rc_read_entry (rc, name, ""));
+
+ g_snprintf (name, 13, "clip_%d_from", i);
+ type = xfce_rc_read_int_entry (rc, name, 0);
+
+ if (type == 0)
+ clipman_add_clip (clipman, value, PRIMARY);
+ else
+ clipman_add_clip (clipman, value, DEFAULT);
+
+ g_free (value);
+ }
}
- return TRUE;
+ xfce_rc_close (rc);
}
-void
-clipman_clips_delete (ClipmanClips *clipman_clips,
- ClipmanClip *clip)
+static ClipmanPlugin *
+clipman_new (XfcePanelPlugin *plugin)
{
- g_return_if_fail (G_LIKELY (NULL != clip));
+ ClipmanPlugin *clipman;
+ clipman = panel_slice_new0 (ClipmanPlugin);
+
+ clipman->clips = g_ptr_array_new ();
+ clipman->plugin = plugin;
+
+ clipman->tooltip = gtk_tooltips_new ();
+ g_object_ref (G_OBJECT (clipman->tooltip));
+
+ /* Load Settings */
+ clipman_read (clipman);
+
+ /* Create panel widgets */
+ clipman->button = xfce_create_panel_toggle_button ();
+ gtk_widget_show (clipman->button);
+
+ clipman->icon = gtk_image_new ();
+ gtk_widget_show (clipman->icon);
+ gtk_container_add (GTK_CONTAINER (clipman->button), clipman->icon);
+
+ gtk_tooltips_set_tip (GTK_TOOLTIPS(clipman->tooltip),
+ clipman->button, _("Clipboard Manager"),
+ NULL);
+
+ g_signal_connect(clipman->button, "button_press_event",
+ G_CALLBACK(clipman_clicked), clipman);
- if (clip->type == STATIC)
- clipman_clips->static_clipboard = g_slist_remove (clipman_clips->static_clipboard, clip);
- else
- clipman_clips->history = g_slist_remove (clipman_clips->history, clip);
+ /* Start the clipman_check function */
+ clipman->TimeoutId = g_timeout_add_full(G_PRIORITY_LOW,
+ TIMER_INTERVAL,
+ (GSourceFunc) clipman_check,
+ clipman,
+ (GDestroyNotify) clipman_reset_timeout);
- clipman_clip_free (clip);
+ /* Connect to the clipboards */
+ defaultClip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ primaryClip = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+
+ return clipman;
}
static void
-clipman_clips_add (ClipmanClips *clipman_clips,
- gchar *text,
- ClipboardType type)
+clipman_free (XfcePanelPlugin *plugin,
+ ClipmanPlugin *clipman)
{
- ClipmanClip *clip;
- GSList *foobar = NULL;
-
- g_return_if_fail (G_LIKELY (NULL != text));
+ guint i;
+ ClipmanClip *clip;
+ GtkWidget *dialog;
- clip = clipman_clip_new (text, type);
+ /* Valgrind notes:
+ - primaryClip and defaultClip should be cleared, but gtk
+ takes care about this
+ */
- if (type == STATIC)
- foobar = g_slist_find_custom (clipman_clips->static_clipboard, clip, (GCompareFunc)clipman_clips_compare);
- else if (clipman_clips->behavior == STRICTLY)
- foobar = g_slist_find_custom (clipman_clips->history, clip, (GCompareFunc)clipman_clips_compare_with_type);
- else
- foobar = g_slist_find_custom (clipman_clips->history, clip, (GCompareFunc)clipman_clips_compare);
+ /* Free the clipboards */
+ gtk_clipboard_clear (primaryClip);
+ gtk_clipboard_clear (defaultClip);
- if (G_UNLIKELY (NULL != foobar))
- {
- /* Free the clip */
- clipman_clip_free (clip);
+ /* Destroy the setting dialog, if this open */
+ dialog = g_object_get_data (G_OBJECT (plugin), "dialog");
- /* Push the existing clip to the top */
- if (type != STATIC)
- {
- clip = (ClipmanClip *)foobar->data;
- clipman_clips->history = g_slist_remove (clipman_clips->history, clip);
- clipman_clips->history = g_slist_prepend (clipman_clips->history, clip);
- }
+ if (dialog)
+ gtk_widget_destroy (dialog);
- return;
+ /* Stop the check loop */
+ clipman->killTimeout = TRUE;
+ if (clipman->TimeoutId != 0)
+ {
+ g_source_remove(clipman->TimeoutId);
+ clipman->TimeoutId = 0;
}
- DBG ("Add to clipboard (%d): `%s'", type, text);
- if (type == STATIC)
- clipman_clips->static_clipboard = g_slist_prepend (clipman_clips->static_clipboard, clip);
- else
+ /* Remove clipboard items */
+ for (i = clipman->clips->len; i--;)
{
- clipman_clips->history = g_slist_prepend (clipman_clips->history, clip);
- if (g_slist_length (clipman_clips->history) > clipman_clips->history_length)
- clipman_clips_delete (clipman_clips, (ClipmanClip *)(g_slist_last (clipman_clips->history)->data));
+ clip = g_ptr_array_index (clipman->clips, i);
+ g_ptr_array_remove_fast (clipman->clips, clip);
+ clipman_free_clip (clip);
}
-}
+ g_ptr_array_free (clipman->clips, TRUE);
-static gint
-clipman_clips_compare (ClipmanClip *one,
- ClipmanClip *two)
-{
- g_return_val_if_fail (G_LIKELY (NULL != one && NULL != two), -1);
- return g_ascii_strcasecmp (one->text, two->text);
+ gtk_tooltips_set_tip (clipman->tooltip, clipman->button, NULL, NULL);
+ g_object_unref (G_OBJECT (clipman->tooltip));
+
+ gtk_widget_destroy (clipman->icon);
+ gtk_widget_destroy (clipman->button);
+
+ clipman->plugin = NULL;
+
+ DBG ("Plugin Freed");
+
+ panel_slice_free (ClipmanPlugin, clipman);
}
-static gint
-clipman_clips_compare_with_type (ClipmanClip *one,
- ClipmanClip *two)
+static gboolean
+clipman_set_size (XfcePanelPlugin *plugin,
+ gint wsize,
+ ClipmanPlugin *clipman)
{
- g_return_val_if_fail (G_LIKELY (NULL != one && NULL != two), -1);
- if (one->type == two->type)
- return g_ascii_strcasecmp (one->text, two->text);
- return -1;
-}
+ GdkPixbuf *pb;
+ gint size;
+ gtk_widget_set_size_request (clipman->button, wsize, wsize);
+ size = wsize - 2 - (2 * MAX (clipman->button->style->xthickness,
+ clipman->button->style->ythickness));
+ DBG("Set clipman button size to %dpx, load icon at %dpx", wsize, size);
-static ClipmanClip *
-clipman_clip_new (gchar *text,
- ClipboardType type)
-{
- ClipmanClip *clip = g_slice_new (ClipmanClip);
- clip->type = type;
- clip->text = text;
- clip->short_text = NULL;
- return clip;
+ pb = xfce_themed_icon_load ("gtk-paste", size);
+ gtk_image_set_from_pixbuf (GTK_IMAGE (clipman->icon), pb);
+ g_object_unref (G_OBJECT (pb));
+
+ return TRUE;
}
static void
-clipman_clip_free (ClipmanClip *clip)
+clipman_construct (XfcePanelPlugin *plugin)
{
- g_return_if_fail (G_LIKELY (NULL != clip));
- g_free (clip->text);
- g_free (clip->short_text);
- g_slice_free (ClipmanClip, clip);
-}
+ ClipmanPlugin *clipman;
+ xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
+ clipman = clipman_new (plugin);
+
+ gtk_container_add (GTK_CONTAINER (plugin), clipman->button);
+
+ xfce_panel_plugin_add_action_widget (plugin, clipman->button);
+
+ g_signal_connect (plugin, "free-data",
+ G_CALLBACK (clipman_free), clipman);
+
+ g_signal_connect (plugin, "save",
+ G_CALLBACK (clipman_save), clipman);
+
+ g_signal_connect (plugin, "size-changed",
+ G_CALLBACK (clipman_set_size), clipman);
+
+ xfce_panel_plugin_menu_show_configure (plugin);
+ g_signal_connect (plugin, "configure-plugin",
+ G_CALLBACK (clipman_configure), clipman);
+}
diff --git a/panel-plugin/clipman.h b/panel-plugin/clipman.h
index 3fcb75fa4b442c53df74b12818175d73b85791a5..1ff072ccbfb8a60dd455e1549677e375e7c13a84 100644
--- a/panel-plugin/clipman.h
+++ b/panel-plugin/clipman.h
@@ -1,7 +1,6 @@
-/* $Id: clipman.h 2395 2007-01-17 17:42:53Z nick $
+/* $Id$
*
* Copyright (c) 2006-2007 Nick Schermer <nick@xfce.org>
- * Copyright (c) 2007 Mike Massonnet <mmassonnet@xfce.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,105 +20,98 @@
#ifndef CLIPMAN_H
#define CLIPMAN_H
-#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfcegui4/libxfcegui4.h>
-
G_BEGIN_DECLS
/* Dialog settings */
#define BORDER 8
/* History settings: default, min and max */
-#define DEFHISTORY 15
+#define DEFHISTORY 10
#define MAXHISTORY 100
#define MINHISTORY 5
/* Character settings: default, min and max */
-#define DEFCHARS 40
+#define DEFCHARS 30
#define MAXCHARS 200
#define MINCHARS 10
/* Default options */
-#define DEFEXITSAVE TRUE
+#define DEFEXITSAVE FALSE
+#define DEFIGNORESELECT TRUE
#define DEFPREVENTEMPTY TRUE
-#define DEFIGNORESELECT FALSE
-#define DEFIGNORESTATIC FALSE
#define DEFBEHAVIOUR 1
#define DEFITEMNUMBERS FALSE
+#define DEFSEPMENU FALSE
/* Milisecond to check the clipboards(s) */
-#define TIMER_INTERVAL 1000
+#define TIMER_INTERVAL 500
typedef enum
{
- DEFAULT,
- PRIMARY,
- STATIC
-} ClipboardType;
+ PRIMARY = 0,
+ DEFAULT
+}
+ClipboardType;
typedef enum
{
- /* DEFAULT,
- * PRIMARY, */
- BOTH = 2
-} StaticSelection;
+ NORMAL = 0,
+ STRICTLY
+}
+ClipboardBehaviour;
-typedef enum
+typedef struct
{
- NORMAL,
- STRICTLY
-} ClipboardBehavior;
+ XfcePanelPlugin *plugin;
-typedef struct _ClipmanPlugin ClipmanPlugin;
-typedef struct _ClipmanClips ClipmanClips;
-typedef struct _ClipmanClip ClipmanClip;
+ GtkWidget *icon;
+ GtkWidget *button;
+ GtkTooltips *tooltip;
-struct _ClipmanPlugin
-{
- XfcePanelPlugin *panel_plugin;
- ClipmanClips *clipman_clips;
+ GPtrArray *clips;
- GtkWidget *button;
- GtkWidget *icon;
- GtkWidget *menu;
+ gint TimeoutId;
+ gboolean killTimeout;
- gboolean menu_separate_clipboards;
- gboolean menu_item_show_number;
- gint menu_item_max_chars;
-};
+ gboolean ExitSave;
+ gboolean IgnoreSelect;
+ gboolean PreventEmpty;
-struct _ClipmanClips
-{
- ClipmanPlugin *clipman_plugin;
+ ClipboardBehaviour Behaviour;
- GtkClipboard *default_clipboard;
- GtkClipboard *primary_clipboard;
+ gboolean ItemNumbers;
+ gboolean SeparateMenu;
- gint timeout;
+ guint HistoryItems;
+ guint MenuCharacters;
+}
+ClipmanPlugin;
- GSList *history;
- GSList *static_clipboard;
+typedef struct
+{
+ gchar *text;
+ gchar *title; /* I've added the title to save
+ * some time when opening the menu */
+ ClipboardType fromtype;
+}
+ClipmanClip;
+
+typedef struct
+{
+ ClipmanPlugin *clipman;
+ ClipmanClip *clip;
+}
+ClipmanAction;
- ClipboardBehavior behavior;
- gint history_length;
- gboolean save_on_exit;
- gboolean prevent_empty;
- gboolean ignore_primary;
- gboolean ignore_static_clipboard;
- StaticSelection static_selection;
-};
+void
+clipman_check_array_len (ClipmanPlugin *clipman);
-struct _ClipmanClip
-{
- ClipboardType type;
- gchar *text;
- gchar *short_text; /* Saves cycles to add menu items */
-};
+void
+clipman_save (XfcePanelPlugin *plugin, ClipmanPlugin *clipman);
-void clipman_clips_delete (ClipmanClips *clipman_clips,
- ClipmanClip *clip);
+void
+clipman_remove_selection_clips (ClipmanPlugin *clipman);
G_END_DECLS
diff --git a/panel-plugin/xfce4-popup-clipman.c b/panel-plugin/xfce4-popup-clipman.c
deleted file mode 100644
index 8cfc14d42b7ff5374e4c2bef88ed10e98771b37d..0000000000000000000000000000000000000000
--- a/panel-plugin/xfce4-popup-clipman.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Clipman - panel plugin for Xfce Desktop Environment
- * popup command to show the clipman menu
- * Copyright (C) 2002-2006 Olivier Fourdan
- * 2008 Mike Massonnet <mmassonnet@xfce.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-
-#include "xfce4-popup-clipman.h"
-
-
-
-static gboolean
-clipman_plugin_check_is_running (GtkWidget *widget,
- Window *xid)
-{
- GdkScreen *gscreen;
- gchar *selection_name;
- Atom selection_atom;
-
- gscreen = gtk_widget_get_screen (widget);
- selection_name = g_strdup_printf (XFCE_CLIPMAN_SELECTION"%d",
- gdk_screen_get_number (gscreen));
- selection_atom = XInternAtom (GDK_DISPLAY (), selection_name, FALSE);
-
- if ((*xid = XGetSelectionOwner (GDK_DISPLAY (), selection_atom)))
- return TRUE;
-
- return FALSE;
-}
-
-gint
-main (gint argc, gchar *argv[])
-{
- GdkEventClient gev;
- GtkWidget *win;
- Window id;
-
- gtk_init (&argc, &argv);
-
- win = gtk_invisible_new ();
- gtk_widget_realize (win);
-
- gev.type = GDK_CLIENT_EVENT;
- gev.window = win->window;
- gev.send_event = TRUE;
- gev.message_type = gdk_atom_intern ("STRING", FALSE);
- gev.data_format = 8;
- g_snprintf (gev.data.b, sizeof (gev.data.b), XFCE_CLIPMAN_MESSAGE);
-
- if (clipman_plugin_check_is_running (win, &id))
- gdk_event_send_client_message ((GdkEvent *)&gev, (GdkNativeWindow)id);
- else
- g_warning ("Can't find the xfce4-clipman-plugin.\n");
- gdk_flush ();
-
- gtk_widget_destroy (win);
-
- return FALSE;
-}
-
diff --git a/panel-plugin/xfce4-popup-clipman.h b/panel-plugin/xfce4-popup-clipman.h
deleted file mode 100644
index e4ef1409c9519779e6b9fcfad43ab0d4bd3faa0b..0000000000000000000000000000000000000000
--- a/panel-plugin/xfce4-popup-clipman.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Clipman - panel plugin for Xfce Desktop Environment
- * popup command to show the clipman menu
- * Copyright (C) 2002-2006 Olivier Fourdan
- * 2008 Mike Massonnet <mmassonnet@xfce.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XFCE4_POPUP_CLIPMAN_H__
-#define __XFCE4_POPUP_CLIPMAN_H__
-
-#define XFCE_CLIPMAN_SELECTION "XFCE_NOTES_SELECTION"
-#define XFCE_CLIPMAN_MESSAGE "MENU"
-
-#endif
-
diff --git a/po/.gitignore b/po/.gitignore
deleted file mode 100644
index 00661f00e365152133625a617b6f66426541efac..0000000000000000000000000000000000000000
--- a/po/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.intltool-merge-cache
-Makefile.in.in
-POTFILES
-stamp-it
-*.gmo
diff --git a/po/ChangeLog b/po/ChangeLog
index 1a1de5b543cb5decf0e8b6568248447c384ab701..34fb15ef88654209972fc002bab3e743af73a87a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,13 +1,3 @@
-2008-02-27 Og Maciel <ogmaciel@gnome.org>
-
- * pt_BR.po: Brazilian Portuguese translation updated by
- Fábio Nogueira <deb-user-ba@ubuntu.com>.
-
-2008-01-14 Mike Massonnet <mmassonnet@xfce.org>
-
- * *.po, *.pot: make update-po
- * fr.po: Update french translation
-
2007-12-07 Maximilian Schleiss <maximilian@xfce.org>
* de.po: German translation update
diff --git a/po/LINGUAS b/po/LINGUAS
index 17d00b63413bedd03b3fb5641fe0373514dd816b..3fa9a550c687d8fa4812aa21543e5bc1ac498195 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
# set of available languages (in alphabetic order)
-ca cs de en_GB eu fr hu it ja lv nb_NO pl pt_BR pt_PT sq uk ur zh_TW
+ca cs de en_GB eu fr hu it ja lv nb_NO pl pt_BR pt_PT uk ur zh_TW
diff --git a/po/ca.po b/po/ca.po
index f93c9448dbc2a0a4f69932b55eb6944396c650b2..cd7912c4569adf40648748211b223b684f475dfc 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-05-11 19:05+0100\n"
"Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
"Language-Team: Catalan <xfce-i18n@xfce.org\n"
@@ -17,135 +17,105 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "No s'ha pogut obrir la url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Gestor de porta-retalls"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "General"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Desa el contingut del porta-retalls _en sortir"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "E_vita tenir el porta-retalls buit"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignora les seleccions"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Comportament del porta-retalls"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "E_vita tenir el porta-retalls buit"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
+
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Gestió del porta-retalls nor_mal"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Separa estrÃctament am_bdós porta-retalls"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Aparença"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Comportament del porta-retalls</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Aparença del menú"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "<b>General</b>"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "Mo_stra el nombre de l’element"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Nombres"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Se_para els porta-retalls"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Aparença del menú</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Historial del porta-retalls:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Menú dels carà cters dels elements:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "No s'ha pogut obrir la url: %s"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Nombres</b>"
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Porta-retalls buit >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Aparença"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Esteu segur de voler esborrar l’historial?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Historial de retalls"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Esteu segur de voler esborrar aquest retall de l’historial?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Buida l'historial"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< L’historial per omisió és buit >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Esculliu l’historial a buidar >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< L’historial per omisió és buit >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Esteu segur de voler esborrar aquest retall de l’historial?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Buida l'historial"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Esteu segur de voler esborrar l’historial?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Historial de retalls"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Porta-retalls buit >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -155,9 +125,6 @@ msgstr "Gestor de porta-retalls per l’escriptori Xfce"
msgid "Clipman"
msgstr "Porta-retalls «Clipman»"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>General</b>"
-
#~ msgid "Properties"
#~ msgstr "Propietats"
diff --git a/po/cs.po b/po/cs.po
index ad181703077d6470f7f1025566a504794446c375..63f2f70df31a16ccf31b269acb1e7c5ac4cf930b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2006-12-20 20:54+0100\n"
"Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
"Language-Team: Czech <xfce-i18n@xfce.org>\n"
@@ -19,135 +19,105 @@ msgstr ""
"X-Poedit-Country: CZECH REPUBLIC\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Nelze otevÅ™Ãt následujÃcà adresu url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Správce schránky"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Obecné"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Uložit obsah schránky pÅ™i _ukonÄenÃ"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "_Zamezit vyprázdněnà schránky"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignorovat výběry"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Chovánà schránky"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "_Zamezit vyprázdněnà schránky"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Obecné</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "_Správa běžné schránky"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Striktně oddělit _obě schránky"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Vzhled"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Chovánà schránky</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Vzhled nabÃdky"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Obecné"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Zobrazovat ÄÃsla položek"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "ÄŒÃsla"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "O_ddělit schránky"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Vzhled nabÃdky</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Položky historie nabÃdky:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Znaky položek nabÃdky:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>ÄŒÃsla</b>"
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Nelze otevÅ™Ãt následujÃcà adresu url: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Schránka je prázdná >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Vzhled"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Opravdu chcete vyprázdnit historii?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Historie správce schránky"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Opravdu chcete odebrat tuto položku z historie?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Vyprázdnit historii"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Výchozà historie je prázdná >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Historie výběrů je prázdná >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Výchozà historie je prázdná >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Opravdu chcete odebrat tuto položku z historie?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Vyprázdnit historii"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Opravdu chcete vyprázdnit historii?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Historie správce schránky"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Schránka je prázdná >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -157,9 +127,6 @@ msgstr "Správce schránky pro prostředà Xfce"
msgid "Clipman"
msgstr "Správce schránky"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Obecné</b>"
-
#~ msgid "Visit the goodies website for more information about this plugin."
#~ msgstr ""
#~ "Pro vÃce informacà o tomto zásuvném modulu navÅ¡tivte webovou stránku Xfce "
diff --git a/po/de.po b/po/de.po
index 8426f48d642692ccba507197acfe38d952adbc33..9ffdb6f5cb665a0edb129332f098084d0a18f7dd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2007-12-06 22:56+0100\n"
"PO-Revision-Date: 2007-12-06 22:58+0000\n"
"Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
"Language-Team: German <xfce-i18n@xfce.org>\n"
@@ -19,135 +19,106 @@ msgstr ""
"X-Poedit-Language: German\n"
"X-Poedit-Country: GERMANY\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Kann die folgende Adresse nicht öffnen: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:991
msgid "Clipboard Manager"
msgstr "Verwaltung der Zwischenablage"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Allgemein"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "_Inhalt der Zwischenablage beim Verlassen speichern"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "_Leere Zwischenablage vermeiden"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Auswahl ignorieren"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Verhalten"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "_Leere Zwischenablage vermeiden"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Allgemein</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "_Normales Verwalten der Zwischenablagen"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "_Beide Zwischenablagen strikt getrennt verwalten"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Aussehen"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Verhalten</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Menü-Aussehen"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Allgemein"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Nummeriere Einträge"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Werte"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "_Zwischenablagen getrennt verwalten"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Menü-Aussehen</b>"
+
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Größe des Verlaufsspeichers:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Länge der Menüeinträge:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Kann die folgende Adresse nicht öffnen: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Zwischenablage leer >"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Werte</b>"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Aussehen"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
msgstr ""
+"Möchten Sie den bisherigen Inhalt der Zwischenablage wirklich löschen?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Verlauf der Zwischenablage"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Möchten Sie den gewählten Eintrag wirklich aus der Liste löschen?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Bisherigen Inhalt löschen"
+#: ../panel-plugin/clipman.c:427
+msgid "< Default History Empty >"
+msgstr "< Inhalt der Standard-Zwischenablage leer >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:478
msgid "< Selection History Empty >"
msgstr "< Inhalt der Auswahl-Zwischenablage leer >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Inhalt der Standard-Zwischenablage leer >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Möchten Sie den gewählten Eintrag wirklich aus der Liste löschen?"
+#: ../panel-plugin/clipman.c:487 ../panel-plugin/clipman.c:552
+msgid "Clear History"
+msgstr "Bisherigen Inhalt löschen"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Möchten Sie den bisherigen Inhalt der Zwischenablage wirklich löschen?"
+#: ../panel-plugin/clipman.c:646
+msgid "Clipman History"
+msgstr "Verlauf der Zwischenablage"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:668
+msgid "< Clipboard Empty >"
+msgstr "< Zwischenablage leer >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -157,9 +128,6 @@ msgstr "Zwischenablagenverwaltung für den Xfce-Desktop"
msgid "Clipman"
msgstr "Zwischenablage"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Allgemein</b>"
-
#~ msgid "Visit the goodies website for more information about this plugin."
#~ msgstr ""
#~ "Besuchen Sie die Goodies-Webseite, um weitere Informationen über dieses "
diff --git a/po/en_GB.po b/po/en_GB.po
index 4eb0c75bbb3322be8ee3bdc51aa180df8f9f1714..e71ad71c0f2dd208cd93a3e7be7f4cd6a9620f65 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,148 +2,118 @@
# Copyright (C) 2005-2007 The Xfce development team.
# This file is distributed under the same license as the xfce4-clipman-plugin package.
# Jeff Bailes <thepizzaking@gmail.com>, 2007.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-03-30 20:24+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
"Language-Team: British English <xfce-i18n@xfce.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Unable to open the following url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Clipboard Manager"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "General"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Save clipboard contents on _exit"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "Pre_vent empty clipboard"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignore selections"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Clipboard Behaviour"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "Pre_vent empty clipboard"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Normal clipboard _management"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Strictly separate _both clipboards"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Appearance"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Clipboard Behaviour</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Menu Appearance"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "General"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Show item numbers"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Numbers"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Se_parate clipboards"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Menu Appearance</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Clipboard history items:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Menu item characters:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Unable to open the following url: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Clipboard Empty >"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Numbers</b>"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Appearance"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Are you sure you want to clear the history?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Clipman History"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Are you sure you want to remove this clip from the history?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Clear History"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Default History Empty >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Selection History Empty >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Default History Empty >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Are you sure you want to remove this clip from the history?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Clear History"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Are you sure you want to clear the history?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Clipman History"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Clipboard Empty >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -153,5 +123,3 @@ msgstr "Clipboard manager for the Xfce desktop"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>General</b>"
diff --git a/po/eu.po b/po/eu.po
index d728d66835a4cac9e9202b503f9b77583351daa2..240cdeffe6e4adc7723cf6e22b976d2d4c15eeea 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2006-09-12 14:51+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Basque <xfce-i18n@xfce.org>\n"
@@ -16,135 +16,105 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Ezin da hurrengo url-a ireki: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Arbel Kudeatzailea"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Orokorra"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "_Irteterakoan arbel edukiak gorde"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "Arbel hutsa Au_rreikusi"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Hautapenak alde batera utzi"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Arbela portaera"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "Arbel hutsa Au_rreikusi"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Orokorra</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Arbel _kudeaketa arrunta"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "_Bi arbelak guztiz bereizi"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Itxura"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Arbela portaera</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Menu Itxura"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Orokorra"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "Elementu _Zenbakiak Bistarazi"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Zenbakiak"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Be_reiziriko arbelak"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Menu Itxura</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Arbela historia elementuak:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Menu elementu karaktereak:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Zenbakiak</b>"
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Ezin da hurrengo url-a ireki: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Arbela Hutsa >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Itxura"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Ziur historia garbitu nahi duzula?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Clipman Historia"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Ziur elementu hau historiatik ezabatu nahi duzula?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Historia garbitu"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Lehenetsiriko Historia Hutsa >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Hautaturiko Historia Hutsa >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Lehenetsiriko Historia Hutsa >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Ziur elementu hau historiatik ezabatu nahi duzula?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Historia garbitu"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Ziur historia garbitu nahi duzula?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Clipman Historia"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Arbela Hutsa >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -154,8 +124,5 @@ msgstr "Xfce idazmahaierako arbel kudeatzailea"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Orokorra</b>"
-
#~ msgid "Visit the goodies website for more information about this plugin."
#~ msgstr "Goodies webgunera joan plugin honetaz argibide gehiagorako."
diff --git a/po/fr.po b/po/fr.po
index de5b8132b6e2035a328ba6c763294dc1f58e678e..a19c8151ac855d92a4c87a60b5d218b14a6c54ef 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2006-12-22 18:06+0100\n"
"Last-Translator: Maximilian Schleiss <maximilian@xfce.org>\n"
"Language-Team: French <xfce-i18n@xfce.org>\n"
@@ -16,135 +16,107 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Échec à l'ouverture du lien : %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162
+#: ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Gestionnaire de presse-papiers"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Général"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "_Enregistrer le contenu du presse-papiers en quittant"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "Éviter un presse-papiers _vide"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignorer les sélections"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Comportement du presse-papiers"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "Éviter un presse-papiers _vide"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Général</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Gestion nor_male du presse-papiers"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Séparer les deux _presse-papiers"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Apparence"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Comportement du presse-papiers</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Apparence du menu"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Général"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Afficher les numéros des éléments"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Nombres"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Sé_parer les presses-papiers"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Apparence du menu</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Éléments de l'historique du presse-papiers :"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Caractères des éléments du menu :"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr "Presse-papiers statique"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Nombres</b>"
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr "Ignorer le presse-papiers statique"
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr "Sélectionner dans le presse-papiers"
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr "Par défaut"
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr "La sélection"
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr "Les deux"
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Échec à l'ouverture du lien : %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Presse-papiers vide >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr "< Presse-papiers statique vide >"
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Apparence"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr "Ajouter un presse-papiers statique"
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Êtes-vous certain de vouloir effacer l'historique ?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Historique du presse-papiers"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Êtes-vous certain de vouloir effacer cet élément de l'historique ?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Effacer l'historique"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Historique par défaut vide >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Historique de la sélection vide >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Historique par défaut vide >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Êtes-vous certain de vouloir effacer cet élément de l'historique ?"
+#: ../panel-plugin/clipman.c:477
+#: ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Effacer l'historique"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Êtes-vous certain de vouloir effacer l'historique ?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Historique du presse-papiers"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr "Texte :"
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Presse-papiers vide >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -154,12 +126,8 @@ msgstr "Gestionnaire de presse-papiers pour l'environnement de bureau Xfce"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Général</b>"
-
#~ msgid "Visit the goodies website for more information about this plugin."
#~ msgstr "Visitez le site web des goodies pour plus d'informations."
-
#~ msgid ""
#~ "Select this option to save the clipboard history when you exit Xfce and "
#~ "restore it when you login again."
@@ -167,21 +135,18 @@ msgstr "Clipman"
#~ "Sélectionner cette option pour enregistrer l'historique du presse-papiers "
#~ "quand vous quittez Xfce et pour la restaurer quand vous accédez de "
#~ "nouveau à votre compte."
-
#~ msgid ""
#~ "Select this option will prevent Clipman from including the contents of "
#~ "the selection in the history."
#~ msgstr ""
#~ "Sélectionner cette option pour empêcher Clipman d'inclure le contenu de "
#~ "la sélection dans l'historique. "
-
#~ msgid ""
#~ "Select this option to prevent an empty clipboard. The most recent history "
#~ "item will be added to the clipboard."
#~ msgstr ""
#~ "Sélectionner cette option pour éviter d'avoir un presse-papiers vide. "
#~ "L'élément le plus récent de l'historique sera ajouté au presse-papiers."
-
#~ msgid ""
#~ "When you've copied or cut some text and it is already in the Clipman "
#~ "history from the selection clipboard, only the content location will be "
@@ -196,7 +161,6 @@ msgstr "Clipman"
#~ "\n"
#~ "Si un élément de l'historique est cliqué, son contenu sera copié dans les "
#~ "deux presse-papiers."
-
#~ msgid ""
#~ "When you've copied or cut some text it will be added to the Clipman "
#~ "history, there will also be a duplicate in the history from the "
@@ -217,43 +181,34 @@ msgstr "Clipman"
#~ "\n"
#~ "Cette option fonctionnera bien mieux si vous sélectionnez l'option "
#~ "\"Séparer les presses-papiers\" dans l'onglet Apparence."
-
#~ msgid "Select this option to show item numbers in the history list."
#~ msgstr ""
#~ "Sélectionner cette option pour afficher les numéros des éléments dans la "
#~ "liste de l'historique."
-
#~ msgid ""
#~ "Select this option to order the history list by primairy and selection "
#~ "clipboard."
#~ msgstr ""
#~ "Sélectionner cette option pour trier la liste de l'historique par "
#~ "sélections primaires du presse-papiers."
-
#~ msgid "The number of items stored in the history list."
#~ msgstr "Le nombre d'éléments stockés dans la liste de l'historique."
-
#~ msgid ""
#~ "The number of characters showed in the history list. After this amount of "
#~ "characters, the history label will be ellipsized."
#~ msgstr ""
#~ "Le nombre de caractères affichés dans la liste de l'historique. Au delà "
#~ "de ce nombre, l'étiquette de l'historique sera abrégée."
-
#~ msgid "Properties"
#~ msgstr "Propriétés"
-
#~ msgid "Use _colored menu items"
#~ msgstr "Éléments de menu en _couleur"
-
#~ msgid "Developer"
#~ msgstr "Développeur"
-
#~ msgid "Edit content"
#~ msgstr "Éditer le contenu"
-
#~ msgid "Question"
#~ msgstr "Question"
-
#~ msgid "What to do with this clipboard item?"
#~ msgstr "Que faire de cet élément du presse-papiers?"
+
diff --git a/po/hu.po b/po/hu.po
index fdf7cc06feb83b502dfe4b9c85fcac8800872f89..d50857b6d93ca0358257368fcd0faedc3caf2af6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,148 +7,117 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
-"PO-Revision-Date: 2008-01-25 23:40+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
+"PO-Revision-Date: 2007-01-08 09:08+0100\n"
"Last-Translator: SZERVÃC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <xfce-i18n@xfce.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural>1;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-Country: HUNGARY\n"
-"X-Poedit-Language: Hungarian\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Az alábbi url nem nyitható meg: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162
+#: ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Vágólap kezelő"
-#: ../panel-plugin/clipman-dialogs.c:108
-#: ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Ãltalános"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Vágólap tartalmak mentése kilépéskor"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "Üres vágólap tiltása"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "Kijelölések k_ihagyása"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Vágólap viselkedés"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "Üres vágólap tiltása"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Ãltalános</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Szokásos vágólap kezelés"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Vágólapok szigorú elválasztása"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Megjelenés"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Vágólap viselkedés</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Menü megjelenés"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Ãltalános"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "Elem_számok mutatása"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Számok"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Külön vágólapok"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Menü megjelenés</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Vágólap történet elemek:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Menü elem karakterek:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Számok</b>"
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Az alábbi url nem nyitható meg: %s"
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Megjelenés"
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Vágólap üres >"
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Tényleg törlöd az előzményeket?"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Tényleg törlöd e vágást az előzők közül?"
#: ../panel-plugin/clipman.c:417
-#: ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Vágólap történet"
-
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Történet törlése"
+msgid "< Default History Empty >"
+msgstr "< Alap történet üres >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Kijelölés történet üres >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Alap történet üres >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Tényleg törlöd e vágást az előzők közül?"
+#: ../panel-plugin/clipman.c:477
+#: ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Történet törlése"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Tényleg törlöd az előzményeket?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Vágólap történet"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr "Szöveg:"
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Vágólap üres >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -158,8 +127,6 @@ msgstr "Egy Xfce vágólap kezelő"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Ãltalános</b>"
#~ msgid "Visit the goodies website for more information about this plugin."
#~ msgstr "A cukik weblapján több leÃrást is lelsz e beillesztésrÅ‘l."
#~ msgid ""
diff --git a/po/it.po b/po/it.po
index 21991bc5879825c298525b4c3515a04349bf279a..a88ddd30ee0fcbc7fc79e1a368a3bac09edf90b5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce 4-clipman-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-05-24 22:51+0200\n"
"Last-Translator: Fabio Riga <usul@aruba.it>\n"
"Language-Team: Italian <xfce-i18n@xfce.org>\n"
@@ -16,135 +16,105 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Impossibile aprire il seguente url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Gestore bacheca"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Generale"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Salva il contenuto della bacheca all'_uscita"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "Pre_vieni bacheca vuota"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignora selezioni"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Comportamento della bacheca"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "Pre_vieni bacheca vuota"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Generale</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Gestione _normale della bacheca"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Due bacheche _strettamente separate"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Aspetto"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Comportamento della bacheca</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Aspetto del menu"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Generale"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Mostra i numeri degli elementi"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Numeri"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Bacheche se_parate"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Aspetto del menu</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Elementi nello storico della bacheca:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Caratteri nell'elemento del menu"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Numeri</b>"
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Impossibile aprire il seguente url: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Bacheca vuota >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Aspetto"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Cancellare lo storico?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Storico della bacheca"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Rimuovere questo appunto dalla bacheca?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Cancella lo storico"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Storico predefinito vuoto >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Storico delle selezioni vuoto >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Storico predefinito vuoto >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Rimuovere questo appunto dalla bacheca?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Cancella lo storico"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Cancellare lo storico?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Storico della bacheca"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Bacheca vuota >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -153,6 +123,3 @@ msgstr "Gestore della bacheca per l'ambiente Xfce"
#: ../panel-plugin/clipman.desktop.in.in.h:2
msgid "Clipman"
msgstr "Bacheca"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Generale</b>"
diff --git a/po/ja.po b/po/ja.po
index 7134abbef33809751dd10a94115bb02d2f8bef1d..effaa75efbbb8cdfd543a8ce8d34324bf6018901 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2006-04-09 19:04+0900\n"
"Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
"Language-Team: Japanese <xfce-i18n@xfce.org>\n"
@@ -16,136 +16,109 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr ""
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "クリップボードマãƒãƒ¼ã‚¸ãƒ£ãƒ¼"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "全般"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "終了時ã«ã‚¯ãƒªãƒƒãƒ—ボードã®å†…容をä¿å˜ã™ã‚‹(_E)"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "クリップボードを空ã«ã—ãªã„(_V)"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "é ˜åŸŸé¸æŠžã‚’無視ã™ã‚‹(_I)"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "クリップボードã®æŒ¯ã‚‹èˆžã„"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "クリップボードを空ã«ã—ãªã„(_V)"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>全般</b>"
+
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "通常ã®ã‚¯ãƒªãƒƒãƒ—ボード管ç†(_M)"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "クリップボードを二ã¤ã«åˆ†ã‘ã‚‹(_B)"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:252
+#, fuzzy
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>クリップボードã®æŒ¯ã‚‹èˆžã„</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "メニューã®å¤–観"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+#, fuzzy
+msgid "General"
+msgstr "<b>全般</b>"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "アイテム数を表示ã™ã‚‹(_S)"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "æ•°"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "クリップボードを分割ã™ã‚‹(_P)"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+#, fuzzy
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>メニューã®å¤–観</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "クリップボードã®å±¥æ´ã‚¢ã‚¤ãƒ†ãƒ æ•°:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "メニューアイテムã®æ–‡å—æ•°:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr ""
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< 空ã®ã‚¯ãƒªãƒƒãƒ—ボード >"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>æ•°</b>"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
msgstr ""
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "å±¥æ´ã‚’クリアã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Clipman å±¥æ´"
+#: ../panel-plugin/clipman.c:299
+#, fuzzy
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "å±¥æ´ã‚’クリアã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "å±¥æ´ã‚’クリア"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< 空ã®æ¨™æº–å±¥æ´ >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< 空ã®é¸æŠžå±¥æ´ >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< 空ã®æ¨™æº–å±¥æ´ >"
-
-#: ../panel-plugin/clipman.c:791
-#, fuzzy
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "å±¥æ´ã‚’クリアã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "å±¥æ´ã‚’クリア"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "å±¥æ´ã‚’クリアã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Clipman å±¥æ´"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< 空ã®ã‚¯ãƒªãƒƒãƒ—ボード >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -155,9 +128,6 @@ msgstr "Xfce デスクトップã®ã‚¯ãƒªãƒƒãƒ—ボードを管ç†ã—ã¾ã™ã€‚"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>全般</b>"
-
#~ msgid "Properties"
#~ msgstr "プãƒãƒ‘ティ"
diff --git a/po/lv.po b/po/lv.po
index d4c676558fd92a6619d7edb15c7f43ce5ba5837f..cf8e2360aa6a7e7ac29541e997a1cdf07ba01b06 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-11-16 20:16+0300\n"
"Last-Translator: Rihards Priedītis <rprieditis@inbox.lv>\n"
"Language-Team: Latvian <rprieditis@inbox.lv>\n"
@@ -15,135 +15,107 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "NeizdevÄs atvÄ“rt sekojoÅ¡u url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162
+#: ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Starpliktuves PÄrvaldnieks"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "VispÄrÄ“ji"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "SaglabÄt starpliktuves saturu uz aizv_erÅ¡anu"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "Novēr_st tukšu starpliktuvi"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignorēt atlasi"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Starpliktuves Uzvedība"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "Novēr_st tukšu starpliktuvi"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>VispÄrÄ“ji</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "ParastÄ starpliktuves _pÄrvaldÄ«ba"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Strikti atdalī_t starpliktuves"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Izskats"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Starpliktuves Uzvedība</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Izvēlņu Izskats"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "VispÄrÄ“ji"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_RÄdÄ«t vienumu skaitu"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Skaitļi"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "At_dalīt starpliktuvi"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Izvēlņu Izskats</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Starpliktuves vēstures vienumi:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Izvēlnes vienuma rakstzīmes:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "NeizdevÄs atvÄ“rt sekojoÅ¡u url: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Starpliktuve ir Tukša >"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Skaitļi</b>"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Izskats"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Esat drošs, ka vēlaties notīrīt vēsturi?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Starpliktuves VÄ“sture"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Esat drošs, ka vēlaties dzēst no starpliktuves vēstures?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Notīrīt Vēsturi"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< NoklusÄ“tÄ VÄ“sture ir TukÅ¡a >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Atlases Vēsture ir Tukša >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< NoklusÄ“tÄ VÄ“sture ir TukÅ¡a >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Esat drošs, ka vēlaties dzēst no starpliktuves vēstures?"
+#: ../panel-plugin/clipman.c:477
+#: ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Notīrīt Vēsturi"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Esat drošs, ka vēlaties notīrīt vēsturi?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Starpliktuves VÄ“sture"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Starpliktuve ir Tukša >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -153,5 +125,3 @@ msgstr "Starpliktuves pÄrvaldnieks Xfce videi"
msgid "Clipman"
msgstr "Starpliktuve"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>VispÄrÄ“ji</b>"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 22631f4d6d86ec8a16d27278b4d54203f3edab8f..8a7cec29f85830d3b11032017d047c42bda0dd03 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0svn-r2842\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-07-01 21:49+0200\n"
"Last-Translator: Terje Uriansrud <ter@operamail.com>\n"
"Language-Team: Norwegian Bokmal\n"
@@ -16,135 +16,105 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Klarte ikke åpne følgende url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Utklippstavlebehandler"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Generelt"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Lagre utklippstavlens innhold ved _avslutning"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "_Unngå tom utklippstavle"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignorer merket område"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Utklippstavle oppførsel"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "_Unngå tom utklippstavle"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Generelt</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "_Normal utklippstavlestyring"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Separer _begge utklippstavlene"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Utseende"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Utklippstavle oppførsel</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Menyutseende"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Generelt"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Vis elementnummer"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Antall"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Se_parate utklippstavler"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Menyutseende</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Utklippstavle historikkelementer"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Antall tegn i menyen"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Antall</b>"
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Klarte ikke åpne følgende url: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Tom utklippstavle >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Utseende"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Er du sikker at du vil slette historikken?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Utklippstavle historikk"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Er du sikker du vil slette dette elementet fra historikken?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Tøm historikk"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Tom standard historikk >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Tom markert historikk >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Tom standard historikk >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Er du sikker du vil slette dette elementet fra historikken?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Tøm historikk"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Er du sikker at du vil slette historikken?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Utklippstavle historikk"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Tom utklippstavle >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -153,6 +123,3 @@ msgstr "Utklippstavlebehandler for Xfce skrivebordet"
#: ../panel-plugin/clipman.desktop.in.in.h:2
msgid "Clipman"
msgstr "Clipman"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Generelt</b>"
diff --git a/po/pl.po b/po/pl.po
index 3efcb3c15ccf043b2af4051cee739c4697d73c78..1ac8fe7456399c1f2d3eea3df22dba7e527b4ce9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2006-04-08 12:19+0900\n"
"Last-Translator: Piotr Maliński <admin@rk.edu.pl>\n"
"Language-Team: Polish <xfce-i18n@xfce.org>\n"
@@ -15,135 +15,105 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Nie można otworzyć URL: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Menadżer Schowka"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Ogólne"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Zapisuj zawartość Schowka przy zamykaniu"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "Za_pobiegaj pustemu schowkowi"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignoruj zaznaczenia"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Zachowanie Schowka"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "Za_pobiegaj pustemu schowkowi"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Ogólne</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "_Normalne zarzÄ…dzanie Schowkiem"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Rozdzielaj oba Schowki"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "WyglÄ…d"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Zachowanie Schowka</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "WyglÄ…d Menu"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Ogólne"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Pokazuj numery obiektów"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Liczba"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Rozdziel Schowki"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>WyglÄ…d Menu</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Historia Schowka:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Menu obiektów:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Liczba</b>"
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Nie można otworzyć URL: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Schowek Pusty >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "WyglÄ…d"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Wyczyścić historię?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Historia Schowka"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Usunąć ten element ze schowka?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Wyczyść Historię"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Domyślna Historia Pusta >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Historia Zaznaczeń Pusta >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Domyślna Historia Pusta >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Usunąć ten element ze schowka?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Wyczyść Historię"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Wyczyścić historię?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Historia Schowka"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Schowek Pusty >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -153,9 +123,6 @@ msgstr "Schowek dla pulpitu Xfce"
msgid "Clipman"
msgstr "Schowek"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Ogólne</b>"
-
#~ msgid "Visit the goodies website for more information about this plugin."
#~ msgstr "Odwiedź stronę Xfce goodies by dowiedzieć się więcej o tej wtyczce."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3fd09610b9743752b5099183945bcc89bb0851b2..3d4508f62f484abc74ef235f365f11c14c35336d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,16 +2,15 @@
# Copyright (C) 2005-2007 The Xfce development team.
# This file is distributed under the same license as the xfce4-clipman-plugin package.
# Gunther Furtado <gunzera0@yahoo.com.br>
-# Vladimir Melo <vladimirmelo@foresightlinux.org>, 2007.
-# Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008.
+# Vladimir Melo <vladimirmelo@foresightlinux.org>
#
msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
-"PO-Revision-Date: 2008-02-11 11:30-0300\n"
-"Last-Translator: Fábio Nogueira <deb-user-ba@ubuntu.com>\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
+"PO-Revision-Date: 2007-08-26 11:11-0300\n"
+"Last-Translator: Vladimir Melo <vladimirmelo@foresightlinux.org>\n"
"Language-Team: Brazilian Portuguese <ldp-br@bazar2.conectiva.com.br>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -19,135 +18,107 @@ msgstr ""
"X-Poedit-Country: BRAZIL\n"
"X-Poedit-Language: Portuguese\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Não foi possÃvel abrir a url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162
+#: ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Gerenciador de área de transferência"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Geral"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Salvar o cont_eúdo da área de transferência ao sair"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "E_vitar área de transferência vazia"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignorar seleções"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Comportamento da área de transferência"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "E_vitar área de transferência vazia"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Geral</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Gerencia_mento normal de área de transferência"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Sepa_rar estritamente as áreas de transferência"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Aparência"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Comportamento da área de transferência</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Aparência do Menu"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Geral"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "Apre_sentar números dos itens"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Números"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Se_parar áreas de transferência"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Aparência do Menu</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Itens do histórico da área de transferência:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Caracteres do item de menu:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr "Ãrea de Transferência Estática"
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr "Ignorar área de transferência e_stática"
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr "Selecionar para Ãreas de Transferências"
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr "Padrão"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Números</b>"
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr "Seleção"
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr "Ambos"
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Não foi possÃvel abrir a url: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Ãrea de Transferência Vazia >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr "< Ãrea de Transferência Estática Vazia >"
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Aparência"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr "Adicionar área de transferência estática"
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Tem certeza que deseja limpar o histórico?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Histórico do Clipman"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Tem certeza de que quer remover esta entrada do histórico?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Limpar Histórico"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Histórico Padrão Vazio >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Histórico de Seleções Vazio >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Histórico Padrão Vazio >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Tem certeza de que quer remover esta entrada do histórico?"
+#: ../panel-plugin/clipman.c:477
+#: ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Limpar Histórico"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Tem certeza que deseja limpar o histórico?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Histórico do Clipman"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr "Texto:"
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Ãrea de Transferência Vazia >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -157,23 +128,18 @@ msgstr "Gerenciador da área de transferência para a área de trabalho do Xfce"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Geral</b>"
-
#~ msgid ""
#~ "Select this option to save the clipboard history when you exit Xfce and "
#~ "restore it when you login again."
#~ msgstr ""
#~ "Selecione esta opção para salvar o histórico da área de transferência ao "
#~ "sair do Xfce e restaurá-lo ao voltar."
-
#~ msgid ""
#~ "Select this option will prevent Clipman from including the contents of "
#~ "the selection in the history."
#~ msgstr ""
#~ "Selecione esta opção para evitar que o Clipman inclua os conteúdos da "
#~ "seleção no histórico."
-
#~ msgid ""
#~ "Select this option to prevent an empty clipboard. The most recent history "
#~ "item will be added to the clipboard."
@@ -181,7 +147,6 @@ msgstr "Clipman"
#~ "Selecione esta opção para evitar que a área de transferência fique vazia. "
#~ "A entrada mais recente do histórico será adicionada à área de "
#~ "transferência."
-
#~ msgid ""
#~ "When you've copied or cut some text and it is already in the Clipman "
#~ "history from the selection clipboard, only the content location will be "
@@ -196,7 +161,6 @@ msgstr "Clipman"
#~ "\n"
#~ "Quando um item do histórico for selecionado, seu conteúdo será copiado "
#~ "para as duas áreas de transferêcia."
-
#~ msgid ""
#~ "When you've copied or cut some text it will be added to the Clipman "
#~ "history, there will also be a duplicate in the history from the "
@@ -216,25 +180,22 @@ msgstr "Clipman"
#~ "\n"
#~ "Esta opção funcionará melhor quando a opção \"Separar áreas de "
#~ "transferência\" for selecionada a partir da aba Aparência."
-
#~ msgid "Select this option to show item numbers in the history list."
#~ msgstr ""
#~ "Selecionar esta opção para mostrar números para os itens da lista do "
#~ "histórico."
-
#~ msgid ""
#~ "Select this option to order the history list by primairy and selection "
#~ "clipboard."
#~ msgstr ""
#~ "Selecionar esta opção para ordenar a lista do histórico por \n"
#~ "área de transferência principal e de seleções."
-
#~ msgid "The number of items stored in the history list."
#~ msgstr "Número de itens armazenado na lista do histórico."
-
#~ msgid ""
#~ "The number of characters showed in the history list. After this amount of "
#~ "characters, the history label will be ellipsized."
#~ msgstr ""
#~ "Número de caracteres mostrados na lista do histórico, após os quais, "
#~ "serão adicionadas reticências ao item no histórico."
+
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 0f7bf757306a8287c6b9260dad89fe3cc3b22a53..4ecc7bef28ab3c6501ef95fc8a23b2d9b730771b 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-06-15 23:33+0100\n"
"Last-Translator: Nuno Miguel <nunis@netcabo.pt>\n"
"Language-Team: \n"
@@ -15,135 +15,107 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Não foi possÃvel abrir o url: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162
+#: ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Gestor de área de transferência"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Geral"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Gravar o conteúdo da área de _transferência ao sair"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "E_vitar área de transferência vazia"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ignorar selecções"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Comportamento da área de transferência"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "E_vitar área de transferência vazia"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Geral</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "_Gestão normal de área de transferência"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "Separar _completamente as áreas de transferência"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Aparência"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Comportamento da área de transferência</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Aparência do Menu"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Geral"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Mostrar números dos itens"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Números"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Se_parar áreas de transferência"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Aparência do Menu</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Itens do histórico da área de transferência:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Caracteres do item de menu:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Não foi possÃvel abrir o url: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Ãrea de transferência vazia >"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Números</b>"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Aparência"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Tem certeza que deseja limpar o histórico?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Histórico do Clipman"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Tem a certeza de que quer remover esta entrada do histórico?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Limpar Histórico"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Histórico Padrão Vazio >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Histórico de seleções vazio >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Histórico Padrão Vazio >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Tem a certeza de que quer remover esta entrada do histórico?"
+#: ../panel-plugin/clipman.c:477
+#: ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Limpar Histórico"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Tem certeza que deseja limpar o histórico?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Histórico do Clipman"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Ãrea de transferência vazia >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -153,23 +125,18 @@ msgstr "Gestor da área de transferência para a área de trabalho do Xfce"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Geral</b>"
-
#~ msgid ""
#~ "Select this option to save the clipboard history when you exit Xfce and "
#~ "restore it when you login again."
#~ msgstr ""
#~ "Selecione esta opção para salvar o histórico da área de transferência ao "
#~ "sair do Xfce e restaurá-lo ao voltar."
-
#~ msgid ""
#~ "Select this option will prevent Clipman from including the contents of "
#~ "the selection in the history."
#~ msgstr ""
#~ "Selecione esta opção para evitar que o Clipman inclua os conteúdos da "
#~ "seleção no histórico."
-
#~ msgid ""
#~ "Select this option to prevent an empty clipboard. The most recent history "
#~ "item will be added to the clipboard."
@@ -177,7 +144,6 @@ msgstr "Clipman"
#~ "Selecione esta opção para evitar que a área de transferência fique vazia. "
#~ "A entrada mais recente do histórico será adicionada à área de "
#~ "transferência."
-
#~ msgid ""
#~ "When you've copied or cut some text and it is already in the Clipman "
#~ "history from the selection clipboard, only the content location will be "
@@ -192,7 +158,6 @@ msgstr "Clipman"
#~ "\n"
#~ "Quando um item do histórico for selecionado, seu conteúdo será copiado "
#~ "para as duas áreas de transferêcia."
-
#~ msgid ""
#~ "When you've copied or cut some text it will be added to the Clipman "
#~ "history, there will also be a duplicate in the history from the "
@@ -212,25 +177,22 @@ msgstr "Clipman"
#~ "\n"
#~ "Esta opção funcionará melhor quando a opção \"Separar áreas de "
#~ "transferência\" for selecionada a partir da aba Aparência."
-
#~ msgid "Select this option to show item numbers in the history list."
#~ msgstr ""
#~ "Selecionar esta opção para mostrar números para os itens da lista do "
#~ "histórico."
-
#~ msgid ""
#~ "Select this option to order the history list by primairy and selection "
#~ "clipboard."
#~ msgstr ""
#~ "Selecionar esta opção para ordenar a lista do histórico por \n"
#~ "área de transferência principal e de seleções."
-
#~ msgid "The number of items stored in the history list."
#~ msgstr "Número de itens armazenado na lista do histórico."
-
#~ msgid ""
#~ "The number of characters showed in the history list. After this amount of "
#~ "characters, the history label will be ellipsized."
#~ msgstr ""
#~ "Número de caracteres mostrados na lista do histórico, após os quais, "
#~ "serão adicionadas reticências ao item no histórico."
+
diff --git a/po/sq.po b/po/sq.po
index f89c23e1e42d2108399768050cdb57398d95fa26..d29421b569cbc1322d31949726a48e8068010096 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-01-27 17:55+0200\n"
"Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
"Language-Team: Albanian <xfce-i18n@xfce.org>\n"
@@ -15,135 +15,108 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "I pazoti të hap url-në vijuese: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162
+#: ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "Përgjegjës i Së Papastrës"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "Të përgjithshme"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Ruaj përmbajtjen e së papastrës gjatë daljes"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Shpërfill përzgjedhje"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Sjellje e së Papastrës"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr ""
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>Të përgjithshme</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "A_dministrim të papastre normale"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Dukje"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Sjellje e së Papastrës</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Dukje Menuje"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "Të përgjithshme"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Shfaq numra objektesh"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Numra"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "N_daj të papastra"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Dukje Menuje</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "Objekte historiku të papastre:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Gërma objekti menuje:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Numra</b>"
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "I pazoti të hap url-në vijuese: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< E papastra Bosh >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Dukje"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Jeni të sigurtë se doni të fshihet historiku?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Historik"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Jeni i sigurtë se doni të fshihet ky shënim nga historiku?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Pastro Historikun"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Historiku Parazgjedhje është Bosh >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Historiku i Përzgjedhjes është Bosh >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Historiku Parazgjedhje është Bosh >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Jeni i sigurtë se doni të fshihet ky shënim nga historiku?"
+#: ../panel-plugin/clipman.c:477
+#: ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Pastro Historikun"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Jeni të sigurtë se doni të fshihet historiku?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Historik"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< E papastra Bosh >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -154,5 +127,3 @@ msgstr "Përgjegjësin i Së Papastrës për Desktopin Xfce 4"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Të përgjithshme</b>"
diff --git a/po/uk.po b/po/uk.po
index fe939862cc8bf11b6a2dccceae6a70dccc625382..b9470fbd27388f49174eb33a403859bb53cd000f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2007-03-13 14:20+0200\n"
"PO-Revision-Date: 2007-03-08 00:51+0200\n"
"Last-Translator: Dmitry Nikitin <luckas_fb@mail.ru>\n"
"Language-Team: Ukrainian <xfce-i18n@xfce.org>\n"
@@ -18,135 +18,105 @@ msgstr ""
"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"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Ðеможливо відкрити наÑтупне поÑиланнÑ: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÑ„ÐµÑ€Ð¾Ð¼ обміну"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "ОÑновне"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "Зберігати вміÑÑ‚ буферу обміну при _виході"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "_Запобігати порожньому буферу обміну"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "_Ігнорувати виділене"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "Поведінка буферу обміну"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "_Запобігати порожньому буферу обміну"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>ОÑновне</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "Звичайне _ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÑ„ÐµÑ€Ð¾Ð¼ обміну"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "ЖорÑтко розділити _обидва буфери обміну"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "Зовнішній виглÑд"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>Поведінка буферу обміну</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "Меню зовнішнього виглÑду"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "ОÑновне"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "_Показувати номера пунктів"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "Ðомери"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "Роз_ділити буфери обміну"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>Меню зовнішнього виглÑду</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "ІÑÑ‚Ð¾Ñ€Ñ–Ñ Ð²Ñ…Ð¾Ð´Ð¶ÐµÐ½ÑŒ до буферу обміну:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "Меню входжень Ñимволів:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>Ðомери</b>"
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "Ðеможливо відкрити наÑтупне поÑиланнÑ: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< Буфер обміну порожній >"
-
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "Зовнішній виглÑд"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "Ви впевнені, що хочете очиÑтити Ñ–Ñторію?"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ñторією буферу обміну"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "Ви впевнені, що хочете видалити цей пункт з Ñ–Ñторії?"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "ОчиÑтити Ñ–Ñторію"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Зазвичай Ñ–ÑÑ‚Ð¾Ñ€Ñ–Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< Вибрати очиÑтити Ñ–Ñторію >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Зазвичай Ñ–ÑÑ‚Ð¾Ñ€Ñ–Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð½Ñ >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "Ви впевнені, що хочете видалити цей пункт з Ñ–Ñторії?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "ОчиÑтити Ñ–Ñторію"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "Ви впевнені, що хочете очиÑтити Ñ–Ñторію?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ–Ñторією буферу обміну"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< Буфер обміну порожній >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -155,6 +125,3 @@ msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÑ„ÐµÑ€Ð¾Ð¼ обміну Ð´Ð»Ñ Xfce"
#: ../panel-plugin/clipman.desktop.in.in.h:2
msgid "Clipman"
msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÑƒÑ„ÐµÑ€Ð¾Ð¼ обміну"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>ОÑновне</b>"
diff --git a/po/ur.po b/po/ur.po
index 91ff3b08b87459c50aff06edb5e6c5f30d4f1b90..781a98c0a7754795243a88e70fa648a12177da47 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2007-10-26 20:09+0500\n"
"Last-Translator: Muhammad Ali Makki <makk.ma@gmail.com>\n"
"Language-Team: Urdu <makki.ma@gmail.com>\n"
@@ -18,135 +18,107 @@ msgstr ""
"X-Poedit-Country: PAKISTAN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "ÛŒÛ url کھولنے میں ناکامی: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:162
+#: ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "کلپ بورڈ منیجر"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "عام"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "_برخاست پر کلپ بورڈ مواد Ù…ØÙوظ کریں"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "خالی کپ بورڈ _منع کریں"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "ا_نتخاب نظر انداز کریں"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "کلپ بورڈ سلوک"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "خالی کپ بورڈ _منع کریں"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>عام</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "عام کلپ بورڈ ا_دارت"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "سختی سے د_ونوں کلپ بورڈ الگ کریں"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "مظÛر"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>کلپ بورڈ سلوک</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "مینیو مظÛر"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "عام"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "عناصر Ú©Û’ نمبر _ظاÛر کریں"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr "نمبر"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "کلپ بورڈز ال_گ کریں"
+
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>مینیو مظÛر</b>"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "کلپ بورڈ Ù…ØÙوظات عناصر:"
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "مینیو عنصر کیریکٹرز:"
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr "ÛŒÛ url کھولنے میں ناکامی: %s"
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< کلپ بورڈ خالی >"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
+msgstr "<b>نمبر</b>"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "مظÛر"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "کیا آپ واقعی Ù…ØÙوظات صا٠کرنا چاÛتے Ûیں؟"
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Clipman Ù…ØÙوظات"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
+msgstr "کیا آپ واقعی ÛŒÛ Ú©Ù„Ù¾ Ù…ØÙوظات سے ختم کرنا چاÛتے Ûیں؟"
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "Ù…ØÙوظات صا٠کریں"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< Ø·Û’ Ø´Ø¯Û Ù…ØÙوظات خالی >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< انتخاب Ù…ØÙوظات خالی >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< Ø·Û’ Ø´Ø¯Û Ù…ØÙوظات خالی >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr "کیا آپ واقعی ÛŒÛ Ú©Ù„Ù¾ Ù…ØÙوظات سے ختم کرنا چاÛتے Ûیں؟"
+#: ../panel-plugin/clipman.c:477
+#: ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "Ù…ØÙوظات صا٠کریں"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "کیا آپ واقعی Ù…ØÙوظات صا٠کرنا چاÛتے Ûیں؟"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Clipman Ù…ØÙوظات"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< کلپ بورڈ خالی >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -156,5 +128,3 @@ msgstr "ایکسÙس ڈیسک ٹاپ کا کلپ بورڈ منیجر"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>عام</b>"
diff --git a/po/xfce4-clipman-plugin.pot b/po/xfce4-clipman-plugin.pot
index eadf9466e91dd96f5494d83bfa8101286e65bf91..59b46ce5066ebcc6ecd42a83f821b6c5fabed95f 100644
--- a/po/xfce4-clipman-plugin.pot
+++ b/po/xfce4-clipman-plugin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,134 +16,104 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../panel-plugin/clipman-dialogs.c:84
-msgid "Clipboard Manager"
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
+msgid "Clipboard Manager"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
+#: ../panel-plugin/clipman-dialogs.c:201
+msgid "_Ignore selections"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:131
-msgid "_Ignore selections"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr ""
-
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
-msgid "Clipboard history items:"
-msgstr ""
-
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
-msgid "Menu item characters:"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
+#: ../panel-plugin/clipman-dialogs.c:313
+msgid "Clipboard history items:"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
+#: ../panel-plugin/clipman-dialogs.c:337
+msgid "Menu item characters:"
msgstr ""
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
msgstr ""
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
msgstr ""
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
msgstr ""
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
msgstr ""
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
msgstr ""
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr ""
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr ""
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
msgstr ""
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
msgstr ""
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
msgstr ""
#: ../panel-plugin/clipman.desktop.in.in.h:1
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 55d8a32a3a26f7965f7c152f91d507880ef52f28..48bee8ff06f423c084298d527e65a1988a3a306d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 06:16+0100\n"
+"POT-Creation-Date: 2006-12-20 17:47+0100\n"
"PO-Revision-Date: 2006-09-06 21:25+0800\n"
"Last-Translator: Hydonsingore Cia <hydonsingore@educities.edu.tw>\n"
"Language-Team: Chinese (traditional) <xfce-i18n@xfce.org>\n"
@@ -16,135 +16,105 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../panel-plugin/clipman-dialogs.c:84
+#: ../panel-plugin/clipman-dialogs.c:66
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr ""
+
+#: ../panel-plugin/clipman-dialogs.c:162 ../panel-plugin/clipman.c:981
msgid "Clipboard Manager"
msgstr "剪貼簿管ç†ç¨‹å¼"
-#: ../panel-plugin/clipman-dialogs.c:108 ../panel-plugin/clipman-dialogs.c:112
-#: ../panel-plugin/clipman-dialogs.c:248
-msgid "General"
-msgstr "一般"
-
-#: ../panel-plugin/clipman-dialogs.c:117
+#: ../panel-plugin/clipman-dialogs.c:194
msgid "Save clipboard contents on _exit"
msgstr "離開時儲å˜å‰ªè²¼ç°¿å…§å®¹(_E)"
-#: ../panel-plugin/clipman-dialogs.c:124
-msgid "Pre_vent empty clipboard"
-msgstr "防æ¢å‰ªè²¼ç°¿ç©ºç™½(_V)"
-
-#: ../panel-plugin/clipman-dialogs.c:131
+#: ../panel-plugin/clipman-dialogs.c:201
msgid "_Ignore selections"
msgstr "忽視é¸å–çš„å€åŸŸ(_I)"
-#: ../panel-plugin/clipman-dialogs.c:139
-msgid "Clipboard Behavior"
-msgstr "剪貼簿行為"
+#: ../panel-plugin/clipman-dialogs.c:208
+msgid "Pre_vent empty clipboard"
+msgstr "防æ¢å‰ªè²¼ç°¿ç©ºç™½(_V)"
+
+#: ../panel-plugin/clipman-dialogs.c:216
+msgid "<b>General</b>"
+msgstr "<b>一般</b>"
-#: ../panel-plugin/clipman-dialogs.c:146
+#: ../panel-plugin/clipman-dialogs.c:234
msgid "Normal clipboard _management"
msgstr "æ£å¸¸çš„剪貼簿管ç†(_M)"
-#: ../panel-plugin/clipman-dialogs.c:155
+#: ../panel-plugin/clipman-dialogs.c:243
msgid "Strictly separate _both clipboards"
msgstr "åš´æ ¼å€åˆ†å…©ä»½å‰ªè²¼ç°¿(_B)"
-#: ../panel-plugin/clipman-dialogs.c:169
-msgid "Appearance"
-msgstr "外觀"
+#: ../panel-plugin/clipman-dialogs.c:252
+msgid "<b>Clipboard Behaviour</b>"
+msgstr "<b>剪貼簿行為</b>"
-#: ../panel-plugin/clipman-dialogs.c:173
-msgid "Menu Appearance"
-msgstr "é¸å–®å¤–觀"
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:260
+msgid "General"
+msgstr "一般"
-#: ../panel-plugin/clipman-dialogs.c:177
+#: ../panel-plugin/clipman-dialogs.c:277
msgid "_Show item numbers"
msgstr "é¡¯ç¤ºé …ç›®ç·¨è™Ÿ(_S)"
-#: ../panel-plugin/clipman-dialogs.c:185
-msgid "Numbers"
-msgstr ""
+#: ../panel-plugin/clipman-dialogs.c:284
+msgid "Se_parate clipboards"
+msgstr "分離剪貼簿(_P)"
-#. History length
-#: ../panel-plugin/clipman-dialogs.c:190
+#: ../panel-plugin/clipman-dialogs.c:291
+msgid "<b>Menu Appearance</b>"
+msgstr "<b>é¸å–®å¤–觀</b>"
+
+#: ../panel-plugin/clipman-dialogs.c:313
msgid "Clipboard history items:"
msgstr "剪貼簿æ·å²å—å¥é …目："
-#. Max menu item chars
-#: ../panel-plugin/clipman-dialogs.c:214
+#: ../panel-plugin/clipman-dialogs.c:337
msgid "Menu item characters:"
msgstr "é¸å–®é …ç›®å—數："
-#: ../panel-plugin/clipman-dialogs.c:244
-msgid "Static Clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:253
-msgid "Ignore _static clipboard"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:261
-msgid "Select to Clipboards"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:268
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:277
-msgid "Selection"
-msgstr ""
-
-#: ../panel-plugin/clipman-dialogs.c:286
-msgid "Both"
+#: ../panel-plugin/clipman-dialogs.c:359
+msgid "<b>Numbers</b>"
msgstr ""
-#: ../panel-plugin/clipman-dialogs.c:314
-#, c-format
-msgid "Unable to open the following url: %s"
-msgstr ""
-
-#: ../panel-plugin/clipman.c:391
-msgid "< Clipboard Empty >"
-msgstr "< æ·å²å—å¥ç©ºç™½ >"
+#: ../panel-plugin/clipman-dialogs.c:364
+msgid "Appearance"
+msgstr "外觀"
-#: ../panel-plugin/clipman.c:408
-msgid "< Static Clipboard Empty >"
-msgstr ""
+#: ../panel-plugin/clipman.c:74
+msgid "Are you sure you want to clear the history?"
+msgstr "您確定您想è¦æ¸…除æ·å²å—å¥å—Žï¼Ÿ"
-#: ../panel-plugin/clipman.c:417 ../panel-plugin/clipman.c:968
-msgid "Add static clipboard"
+#: ../panel-plugin/clipman.c:299
+msgid "Are you sure you want to remove this clip from the history?"
msgstr ""
-#: ../panel-plugin/clipman.c:436
-msgid "Clipman History"
-msgstr "Clipman æ·å²å—å¥"
-
-#. Append clear history
-#: ../panel-plugin/clipman.c:442
-msgid "Clear History"
-msgstr "清除æ·å²å—å¥"
+#: ../panel-plugin/clipman.c:417
+msgid "< Default History Empty >"
+msgstr "< é è¨æ·å²å—å¥ç©ºç™½ >"
-#: ../panel-plugin/clipman.c:619
+#: ../panel-plugin/clipman.c:468
msgid "< Selection History Empty >"
msgstr "< é¸å–æ·å²å—å¥ç©ºç™½ >"
-#: ../panel-plugin/clipman.c:630
-msgid "< Default History Empty >"
-msgstr "< é è¨æ·å²å—å¥ç©ºç™½ >"
-
-#: ../panel-plugin/clipman.c:791
-msgid "Are you sure you want to remove this clip from the history?"
-msgstr ""
+#: ../panel-plugin/clipman.c:477 ../panel-plugin/clipman.c:542
+msgid "Clear History"
+msgstr "清除æ·å²å—å¥"
-#: ../panel-plugin/clipman.c:863
-msgid "Are you sure you want to clear the history?"
-msgstr "您確定您想è¦æ¸…除æ·å²å—å¥å—Žï¼Ÿ"
+#: ../panel-plugin/clipman.c:636
+msgid "Clipman History"
+msgstr "Clipman æ·å²å—å¥"
-#. Label
-#: ../panel-plugin/clipman.c:984
-msgid "Text:"
-msgstr ""
+#: ../panel-plugin/clipman.c:658
+msgid "< Clipboard Empty >"
+msgstr "< æ·å²å—å¥ç©ºç™½ >"
#: ../panel-plugin/clipman.desktop.in.in.h:1
msgid "Clipboard manager for the Xfce desktop"
@@ -154,9 +124,6 @@ msgstr "Xfce æ¡Œé¢ç’°å¢ƒçš„剪貼簿管ç†ç¨‹å¼"
msgid "Clipman"
msgstr "Clipman"
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>一般</b>"
-
#~ msgid ""
#~ "Select this option to save the clipboard history when you exit Xfce and "
#~ "restore it when you login again."