Request 278 (accepted)

cairo-dock.changes Changed

cairo-dock.spec Changed

@@ -14,20 +14,42 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:           cairo-dock
-Version:        3.0.1
+Version:        3.0.2
 %define soname  3
 Release:        0.pm.1
-Summary:        A small simple but effective doclet like Mac
 License:        GPL-3.0+
-URL:            http://www.glx-dock.org/
+Summary:        A small simple but effective doclet like Mac
+Url:            http://www.glx-dock.org/
 Group:          System/GUI/GNOME
 Source0:        https://launchpad.net/cairo-dock-core/3.0/%{version}/+download/cairo-dock-%{version}.tar.gz
-Patch1:         cairo-dock-remove_build_timestamps.patch
+# PATCH-FEATURE-OPENSUSE cairo-dock-remove_build_timestamps.patch -- remove build timestamp; prevent build-compare false positives;
+Patch0:         cairo-dock-remove_build_timestamps.patch
+# PATCH-FIX-UPSTREAM cairo-dock-3.0.2-arraysubscript.patch adam@mizerski.pl lp#1050357 -- remove access to nonexisting array field.
+Patch1:         cairo-dock-3.0.2-arraysubscript.patch
+# PATCH-FIX-UPSTREAM cairo-dock-3.0.2-no-return-in-nonvoid-function.patch adam@mizerski.pl lp#1050399 -- fix no-return-in-nonvoid-function
+Patch2:         cairo-dock-3.0.2-no-return-in-nonvoid-function.patch
 Source99:       cairo-dock-rpmlintrc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  cmake dbus-1-glib-devel gcc-c++ gtk2-devel gtkglext-devel
-BuildRequires:  libcurl-devel librsvg-devel libxml++-devel
-BuildRequires:  fdupes pkg-config update-desktop-files
+BuildRequires:  cmake
+BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  pkg-config
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
+BuildRequires:  pkgconfig(gthread-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(pangox)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xtst)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Cairo-dock was in the beginning a small simple but effective dock.
@@ -44,43 +66,53 @@
 Summary:        Development environment for %{name}
 Group:          Development/Libraries/X11
 Requires:       %{name} = %{version}
-Requires:       cmake dbus-1-glib-devel gcc-c++ gtk2-devel gtkglext-devel
-Requires:       libcurl-devel librsvg-devel libxml++-devel
-Requires:       fdupes pkg-config update-desktop-files
+Requires:       pkgconfig(gldi) = %{version}
 
 %description devel
 This package contains all files necessary to build plugins
 
 %package -n libgldi%{soname}
-Group:          System/Libraries
 Summary:        Library needed by cairo-dock
+Group:          System/Libraries
 
 %description -n libgldi%{soname}
 Cairo-dock is a small simple but effective doclet like Mac
 Library needed by cairo-dock.
 
+%package -n libgldi%{soname}-devel
+Summary:        Library needed by cairo-dock
+Group:          Development/Libraries/X11
+Requires:       libgldi%{soname} = %{version}
+
+%description -n libgldi%{soname}-devel
+Cairo-dock is a small simple but effective doclet like Mac
+Library needed by cairo-dock.
+
 %prep
 %setup -q
-%patch1
+%patch0
+%patch1 -p1
+%patch2 -p1
 
 %build
-%__mkdir build
+mkdir build
 pushd build
     cmake \
-    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-    -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
-    -DCMAKE_SKIP_RPATH=TRUE \
-    -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-    %if %{_lib} == lib64
-    -DLIB_SUFFIX=64 \
-    %endif
-    ..
-    %__make %{?_smp_flags}
+        -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+        -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+        -DCMAKE_C_FLAGS="%optflags" \
+        -DCMAKE_SKIP_RPATH=TRUE \
+        -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
+        %if %{_lib} == lib64
+        -DLIB_SUFFIX=64 \
+        %endif
+        ..
+    make %{?_smp_flags}
 popd
 
 %install
 pushd build
-    %makeinstall
+%make_install
 popd
 
 %suse_update_desktop_file -r -n %{name} Utility DesktopUtility
@@ -93,9 +125,6 @@
 %post   -n libgldi%{soname} -p /sbin/ldconfig
 %postun -n libgldi%{soname} -p /sbin/ldconfig
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc %{_datadir}/cairo-dock/ChangeLog.txt
@@ -110,15 +139,12 @@
 %{_datadir}/cairo-dock/icons/*.png
 %{_datadir}/cairo-dock/icons/*.svg
 %{_datadir}/cairo-dock/icons/*.xpm
-%dir %{_datadir}/cairo-dock/images
-%{_datadir}/cairo-dock/images/*
+%{_datadir}/cairo-dock/images/
 %dir %{_datadir}/cairo-dock/gauges/
-%dir %{_datadir}/cairo-dock/gauges/Turbo-night-fuel
-%{_datadir}/cairo-dock/gauges/Turbo-night-fuel/*
+%{_datadir}/cairo-dock/gauges/Turbo-night-fuel/
 %dir %{_datadir}/cairo-dock/explosion/
 %{_datadir}/cairo-dock/explosion/*.png
-%dir %{_datadir}/cairo-dock/scripts
-%{_datadir}/cairo-dock/scripts/*
+%{_datadir}/cairo-dock/scripts/
 %{_datadir}/applications/cairo-dock-cairo.desktop
 %{_datadir}/applications/cairo-dock.desktop
 %{_datadir}/pixmaps/cairo-dock.svg
@@ -130,13 +156,15 @@
 %files devel
 %defattr(-, root, root)
 %{_includedir}/cairo-dock
-%{_libdir}/libgldi.so
 %{_libdir}/pkgconfig/cairo-dock.pc
-%{_libdir}/pkgconfig/gldi.pc
 
 %files -n libgldi%{soname}
 %defattr(-, root, root)
-%{_libdir}/libgldi.so.%{soname}
-%{_libdir}/libgldi.so.%{soname}.*
+%{_libdir}/libgldi.so.%{soname}*
+
+%files -n libgldi%{soname}-devel
+%defattr(-, root, root)
+%{_libdir}/libgldi.so
+%{_libdir}/pkgconfig/gldi.pc
 
 %changelog

cairo-dock-3.0.2-arraysubscript.patch Added

cairo-dock-3.0.2-no-return-in-nonvoid-function.patch Added

@@ -0,0 +1,43 @@
+diff -rupN cairo-dock-3.0.2/src/gldit/cairo-dock-desklet-factory.c cairo-dock-3.0.2_mod/src/gldit/cairo-dock-desklet-factory.c
+--- cairo-dock-3.0.2/src/gldit/cairo-dock-desklet-factory.c	2012-06-15 18:46:48.000000000 +0200
++++ cairo-dock-3.0.2_mod/src/gldit/cairo-dock-desklet-factory.c	2012-09-13 13:26:18.445988715 +0200
+@@ -1299,4 +1299,5 @@ gboolean cairo_dock_detach_icon_from_des
+ 	
+ 	// calculate icons
+ 	cairo_dock_update_desklet_icons (pDesklet);
++	return TRUE;
+ }
+diff -rupN cairo-dock-3.0.2/src/gldit/cairo-dock-dock-factory.c cairo-dock-3.0.2_mod/src/gldit/cairo-dock-dock-factory.c
+--- cairo-dock-3.0.2/src/gldit/cairo-dock-dock-factory.c	2012-06-15 18:46:48.000000000 +0200
++++ cairo-dock-3.0.2_mod/src/gldit/cairo-dock-dock-factory.c	2012-09-13 13:32:00.767379820 +0200
+@@ -476,6 +476,7 @@ static gboolean _on_dock_destroyed (GtkW
+ 		NULL,
+ 		_on_menu_destroyed,
+ 		pContainer);
++	return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+ }
+ static void _setup_menu (CairoContainer *pContainer, Icon *pIcon, GtkWidget *pMenu)
+ {
+diff -rupN cairo-dock-3.0.2/src/gldit/cairo-dock-file-manager.c cairo-dock-3.0.2_mod/src/gldit/cairo-dock-file-manager.c
+--- cairo-dock-3.0.2/src/gldit/cairo-dock-file-manager.c	2012-06-15 18:46:48.000000000 +0200
++++ cairo-dock-3.0.2_mod/src/gldit/cairo-dock-file-manager.c	2012-09-13 13:59:44.583486775 +0200
+@@ -115,6 +115,7 @@ static gpointer _cairo_dock_fm_launch_ur
+ 	cd_debug ("%s (%s)", __func__, cURI);
+ 	s_pEnvBackend->launch_uri (cURI);
+ 	g_free (cURI);
++	return NULL;
+ }
+ gboolean cairo_dock_fm_launch_uri (const gchar *cURI)
+ {
+diff -rupN cairo-dock-3.0.2/src/gldit/cairo-dock-module-manager.c cairo-dock-3.0.2_mod/src/gldit/cairo-dock-module-manager.c
+--- cairo-dock-3.0.2/src/gldit/cairo-dock-module-manager.c	2012-06-15 18:46:48.000000000 +0200
++++ cairo-dock-3.0.2_mod/src/gldit/cairo-dock-module-manager.c	2012-09-13 14:02:15.897121711 +0200
+@@ -591,7 +591,7 @@ void cairo_dock_release_data_slot (Cairo
+ 	pInstance->iSlotID = 0;
+ }
+ 
+-static gboolean _write_modules (gpointer data)
++static void _write_modules (gpointer data)
+ {
+ 	gchar *cModuleNames = cairo_dock_list_active_modules ();
+

cairo-dock-3.0.1.tar.gz/CMakeLists.txt -> cairo-dock-3.0.2.tar.gz/CMakeLists.txt Changed

cairo-dock-3.0.1.tar.gz/po/ar.po -> cairo-dock-3.0.2.tar.gz/po/ar.po Changed

cairo-dock-3.0.1.tar.gz/po/be.po -> cairo-dock-3.0.2.tar.gz/po/be.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-01 14:07+0000\n"
-"Last-Translator: Vitaly Danilovich <Unknown>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 18:54+0000\n"
+"Last-Translator: Matthieu Baerts <matttbe@gmail.com>\n"
 "Language-Team: Belarusian <be@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:20+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:38+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "Language: be\n"
 
@@ -420,6 +420,8 @@
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+" Fabounet https://launchpad.net/~fabounet03\n"
+" Matthieu Baerts https://launchpad.net/~matttbe\n"
 " Vitaly Danilovich https://launchpad.net/~danvyr"
 
 #: ../src/cairo-dock-menu.c:285

cairo-dock-3.0.1.tar.gz/po/bn.po -> cairo-dock-3.0.2.tar.gz/po/bn.po Changed

cairo-dock-3.0.1.tar.gz/po/ca.po -> cairo-dock-3.0.2.tar.gz/po/ca.po Changed

cairo-dock-3.0.1.tar.gz/po/cs.po -> cairo-dock-3.0.2.tar.gz/po/cs.po Changed

cairo-dock-3.0.1.tar.gz/po/cy.po -> cairo-dock-3.0.2.tar.gz/po/cy.po Changed

cairo-dock-3.0.1.tar.gz/po/de.po -> cairo-dock-3.0.2.tar.gz/po/de.po Changed

cairo-dock-3.0.1.tar.gz/po/el.po -> cairo-dock-3.0.2.tar.gz/po/el.po Changed

cairo-dock-3.0.1.tar.gz/po/en_GB.po -> cairo-dock-3.0.2.tar.gz/po/en_GB.po Changed

cairo-dock-3.0.1.tar.gz/po/eo.po -> cairo-dock-3.0.2.tar.gz/po/eo.po Changed

cairo-dock-3.0.1.tar.gz/po/es.po -> cairo-dock-3.0.2.tar.gz/po/es.po Changed

@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: 1.6.2\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 12:53+0000\n"
-"Last-Translator: Fabounet <fabounet03@gmail.com>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-06-12 06:24+0000\n"
+"Last-Translator: Morgus <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:22+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-13 04:35+0000\n"
+"X-Generator: Launchpad (build 15389)\n"
 "Language: \n"
 "X-Poedit-Language: Spanish\n"
 
@@ -30,7 +30,7 @@
 
 #: ../src/cairo-dock-gui-commons.c:369
 msgid "Configure this applet"
-msgstr "Configurar esta mini-aplicación"
+msgstr "Configurar esta miniaplicación"
 
 #: ../src/cairo-dock-gui-commons.c:406 ../src/cairo-dock-gui-main.c:131
 msgid "Files"
@@ -187,7 +187,7 @@
 
 #: ../src/cairo-dock-gui-main.c:1541
 msgid "Applets can be displayed on your desktop as widgets."
-msgstr "Las mini-aplicaciones pueden situarse en el escritorio como objetos."
+msgstr "Las miniaplicaciones pueden situarse en el escritorio como objetos."
 
 #: ../src/cairo-dock-gui-main.c:1542 ../data/messages:89 ../data/messages:989
 msgid "Desklets"
@@ -313,7 +313,7 @@
 msgid ""
 "Click on an applet in order to have a preview and a description for it."
 msgstr ""
-"Haga clic sobre una mini-aplicación para tener una vista previa y una "
+"Pulse sobre una miniaplicación para ver una previsualización y una "
 "descripción de ella."
 
 #: ../src/cairo-dock-gui-simple.c:823
@@ -322,7 +322,7 @@
 
 #: ../src/cairo-dock-gui-simple.c:825 ../data/messages:485
 msgid "On click:"
-msgstr "Al hacer clic:"
+msgstr "Al pulsar:"
 
 #: ../src/cairo-dock-gui-simple.c:898
 msgid ""
@@ -374,7 +374,7 @@
 
 #: ../src/cairo-dock-menu.c:219 ../src/cairo-dock-menu.c:953
 msgid "Get more applets!"
-msgstr "¡Obtener más complementos!"
+msgstr "Obtener más miniaplicaciones"
 
 #: ../src/cairo-dock-menu.c:223 ../src/cairo-dock-menu.c:229
 msgid "Donate"
@@ -422,18 +422,42 @@
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+" Adolfo Jayme Barrientos https://launchpad.net/~fitoschido\n"
+" Alain Jerrel Bustamante-López https://launchpad.net/~zanmato\n"
 " Albert Milian https://launchpad.net/~mln-gmx\n"
+" Andrés Casals Jahnsen https://launchpad.net/~mxwig23\n"
+" Carlos Joel Delgado Pizarro https://launchpad.net/~carlosj2585\n"
 " Carlos Rosales https://launchpad.net/~chartre\n"
+" Daniel O. Mondaca S. https://launchpad.net/~dnielm\n"
+" David Portella https://launchpad.net/~dobled\n"
 " DiegoJ https://launchpad.net/~diegojromerolopez\n"
+" FaPrO https://launchpad.net/~fabro-pro\n"
 " Fabounet https://launchpad.net/~fabounet03\n"
+" Florencia Mincucci https://launchpad.net/~flomincucci\n"
+" Gonzalo Testa https://launchpad.net/~gonzalogtesta\n"
+" Harold https://launchpad.net/~sancospi\n"
 " Joaquín Padilla Rivero https://launchpad.net/~logseman\n"
+" José A. Fuentes Santiago https://launchpad.net/~joanfusan\n"
+" José Luis Figueroa https://launchpad.net/~jolfig\n"
+" Juan Eduardo Riva https://launchpad.net/~juaneduardoriva\n"
+" Juan Pablo Marzetti https://launchpad.net/~yonpols\n"
+" Kaede https://launchpad.net/~caramelo--asesino\n"
 " Martín V. https://launchpad.net/~martinvukovic\n"
 " Miguel Valdiri Badillo https://launchpad.net/~catastro1\n"
 " Monkey https://launchpad.net/~monkey-libre\n"
 " Morgus https://launchpad.net/~morgus\n"
+" Patricio Gonzalez https://launchpad.net/~pagondel\n"
+" Ricardo A. Hermosilla Carrillo https://launchpad.net/~rahermosillac\n"
 " Sergio Meneses https://launchpad.net/~sergiomeneses\n"
+" Stefano Prenna https://launchpad.net/~stefanoprenna\n"
+" benjamin https://launchpad.net/~jesuisbenjamin\n"
 " david cg https://launchpad.net/~dcardelleg\n"
-" orvalius https://launchpad.net/~orvalius"
+" hoortiz https://launchpad.net/~hoortiz\n"
+" hug0 https://launchpad.net/~hug0\n"
+" orvalius https://launchpad.net/~orvalius\n"
+" polkillas https://launchpad.net/~paulsanzcalvo\n"
+" rubioo https://launchpad.net/~rubioo\n"
+" sebikul https://launchpad.net/~sebikul"
 
 #: ../src/cairo-dock-menu.c:285
 msgid "Support"
@@ -487,9 +511,9 @@
 "Now move some launchers or applets into it by right-clicking on the icon -> "
 "move to another dock"
 msgstr ""
-"El nuevo lanzador ha sido creado.\n"
-"Ahora mueva algunos lanzadores o complementos dentro haciendo clic derecho "
-"en el ícono -> mover a otro lanzador"
+"Se ha creado el nuevo dock.\n"
+"Ahora, mueva algunos lanzadores o miniaplicaciones a él pulsando con el "
+"botón derecho sobre un icono ‣ Mover a otro dock"
 
 #: ../src/cairo-dock-menu.c:567
 msgid "Add"
@@ -542,9 +566,9 @@
 "You can customize it by right-clicking on it -> cairo-dock -> configure this "
 "dock."
 msgstr ""
-"El nuevo lanzador ha sido creado.\n"
-"Puede personalizarlo haciendo clic derecho en él -> cairo-dock -> configurar "
-"este lanzador"
+"Se ha creado el nuevo dock.\n"
+"Puede personalizarlo pulsando con el botón derecho sobre él ‣ Cairo-Dock ‣ "
+"Configurar este dock"
 
 #: ../src/cairo-dock-menu.c:754
 msgid ""
@@ -558,7 +582,7 @@
 #, c-format
 msgid "You're about to remove this applet (%s) from the dock. Are you sure?"
 msgstr ""
-"Está apunto de remover la mini-aplicación (%s) de la barra. ¿Está seguro?"
+"Está a punto de quitar esta miniaplicación (%s) del dock. ¿Está seguro?"
 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2007 Cairo-Dock project
@@ -572,7 +596,7 @@
 
 #: ../src/cairo-dock-menu.c:858
 msgid "Configure behaviour, appearance, and applets."
-msgstr "Configurar el comportamiento, la apariencia y aplicaciones."
+msgstr "Configurar comportamiento, apariencia y miniaplicaciones."
 
 #: ../src/cairo-dock-menu.c:863
 msgid "Configure this dock"
@@ -620,8 +644,8 @@
 msgid ""
 "Third-party applets provide integration with many programs, like Pidgin"
 msgstr ""
-"Los complementos de terceros proveen integración con otros programas, como "
-"Pidgin"
+"Las miniaplicaciones de terceros proporcionan integración con muchos "
+"programas, como Pidgin"
 
 #: ../src/cairo-dock-menu.c:961 ../src/help/applet-init.c:28
 #: ../src/help/applet-notifications.c:257
@@ -688,7 +712,7 @@
 
 #: ../src/cairo-dock-menu.c:1065
 msgid "Applet's handbook"
-msgstr "Guía de la mini-aplicación"
+msgstr "Guía de la miniaplicación"
 
 #: ../src/cairo-dock-menu.c:1110
 msgid "Pick up an image"
@@ -1189,13 +1213,11 @@
 "Hope you will enjoy this soft !\n"
 " (you can now click on this dialog to close it)"
 msgstr ""
-"Bienvenido a Cairo-Dock !\n"
-"Esta aplicación esta aquí para ayudarlo a comenzar usando el dock; solo e "
-"click sobre el.\n"
-"Si tiene alguna pregunta/solicitud/observación, por favor visítenos en "
-"http://glx-dock.org.\n"
-"Esperamos disfrute este software!\n"
-" (ahora se puede hacer click en este cuadro de dialogo para cerrarlo)"
+"¡Bienvenido a Cairo-Dock!\n"
+"Esta miniaplicación le ayudará a usar el dock, solo pulse sobre ella.\n"
+"Si tiene preguntas/pedidos/sugerencias, visítenos en http://glx-dock.org.\n"
+"Esperamos que disfrute este software.\n"
+" (pulse en este diálogo para cerrarlo)"
 
 #: ../src/help/applet-composite.c:160
 msgid "Don't ask me any more"
@@ -1244,13 +1266,12 @@
 "Middle-click to open the configuration window.\n"
 "Right-click to access some troubleshooting actions."
 msgstr ""
-"Esta aplicación se hace para ayudarlo.\n"
-"Haga click en el icono para que aparezca consejos útiles acerca de las "
-"posibilidades de El Cairo-Dock.\n"
-"Haga click con el botón central del ratón para abrir la ventana de "
-"configuración.\n"
-"Haga click con el botón derecho para acceder a algunas de las acciones de "
-"solución de problemas."
+"Esta miniaplicación tiene como objetivo ayudarle.\n"
+"Pulse en su icono para mostrar consejos útiles sobre las posibilidades de "
+"Cairo-Dock.\n"
+"Pulse con el botón central para abrir la ventana de configuración.\n"
+"Pulse con el botón derecho para acceder a algunas acciones de solución de "
+"problemas."
 
 #: ../src/help/applet-notifications.c:247
 msgid "Open global settings"
@@ -1329,11 +1350,11 @@
 "Some applets let you bind a shortkey to an action, and decide which action "
 "sould be on middle-click."
 msgstr ""
-"La mayoría de los iconos del dock realizan varias acciones : la acción "
-"primaria con el botón izquierdo del ratón, una acción secundaria con el "
-"botón central y acciones adicionales con el botón derecho (en el menú).\n"
-"Algunos complementos permiten vincular una tecla de acceso rápido a una "
-"acción y decidir qué acción se realiza con el click central."
+"La mayoría de iconos en el dock tienen varias acciones: la acción primaria "
+"se ejecuta al pulsar, la acción secundaria al pulsar con el botón central, y "
+"acciones adicionales al pulsar con el botón derecho.\n"
+"Algunas miniaplicaciones le permiten vincular una tecla de acceso rápido a "
+"una acción y así decidir qué acción realizar al pulsar con el botón central."
 
 #: ../data/messages:7
 msgid "Adding features"
@@ -1349,16 +1370,16 @@
 "the \"More applets\" button (which will lead you to our applets web page) "
 "and then just drag-and-drop the link of an applet into your dock."
 msgstr ""
-"Cairo-Dock tiene muchos complementos. Los complementos son pequeñas "
-"aplicaciones dentro del dock, por ejemplo un reloj o un botón de finalizar "
-"sesión.\n"
-"Para habilitar nuevos complementos, ir a preferencias (click derecho -> "
-"Cairo-Dock -> configurar), ir a \"Componentes adicionales\", y marcar el "
-"complemento que se desea.\n"
-"Más complementos se pueden instalar fácilmente: en la ventana de "
-"configuración, click en el botón de \"Obtener más complementos\" (que nos "
-"redireccionará a nuestra página web de complementos) y luego simplemente "
-"arrastrar el enlace del complemento deseado al dock."
+"Cairo-Dock tiene muchas miniaplicaciones. Las miniaplicaciones son pequeños "
+"complementos que residen en el dock, por ejemplo un reloj o un botón para "
+"cerrar sesión.\n"
+"Para activar miniaplicaciones nuevas, abra la configuración (pulsación "
+"derecha ‣ Cairo-Dock ‣ Configurar), vaya a «Añadidos», y active la "
+"miniaplicación que desee.\n"
+"Puede instalar más miniaplicaciones fácilmente: en la ventana de "
+"configuración, pulse en «Más miniaplicaciones» (que le llevará a nuestro "
+"sitio web de miniaplicaciones) y luego arrastre el enlace de una "
+"miniaplicación y suéltelo en su dock."
 
 #: ../data/messages:13
 msgid "Adding a launcher"
@@ -1374,8 +1395,8 @@
 "Se puede añadir un lanzador arrastrándolo desde el menú de Aplicaciones y "
 "soltándolo dentro del dock. Una flecha animada aparecerá cuando se pueda "
 "soltar.\n"
-"Alternativamente, si una aplicación ya está abierta, se puede hacer click "
-"derecho en su icono y seleccionar \"Crear un lanzador\"."
+"Alternativamente, si una aplicación ya está abierta, puede pulsar su icono "
+"con el botón derecho y seleccionar «Crear un lanzador»."
 
 #: ../data/messages:17
 msgid "Removing a launcher"
@@ -1441,6 +1462,17 @@
 "of them to be used instead of the default icon theme, in the global config "
 "window."
 msgstr ""
+"Para un lanzador o miniaplicación:\n"
+"Abra la configuración de un icono y establezca la ruta a una imagen.\n"
+"- Para un icono de aplicación:\n"
+"Pulsación derecha sobre el icono ‣ «Otras acciones» ‣ «Establecer un icono "
+"personalizado», y elija una imagen. Para quitar la imagen personalizada, "
+"pulsación derecha sobre el icono ‣ «Otras acciones» ‣ «Quitar el icono "
+"personalizado».\n"
+"\n"
+"Si ha instalado temas de iconos en su equipo, también puede seleccionar uno "
+"de ellos para su uso en lugar del tema predeterminado, en la ventana de "
+"configuración global."
 
 #: ../data/messages:33
 msgid "Resizing icons"
@@ -1456,13 +1488,13 @@
 "Also, you can define the size of each applet independently in their own "
 "settings."
 msgstr ""
-"Se pueden hacer los iconos o el efecto de zoom mayor o menor. Aprir las "
-"opciones (click derecho -> Cairo-Dock -> configuración), e ir a Apariencia "
-"(o Iconos en modo avanzado).\n"
-"Notar que si hay demasiados iconos en el dock, serán emequeñecidos para "
-"caber en la pantalla.\n"
-"También se puede definir el tamaño de cada complemento independientemente en "
-"sus opciones."
+"Puede cambiar el tamaño de los iconos y el efecto de ampliación. Abra la "
+"configuración (pulsación derecha ‣ Cairo-Dock ‣ Configurar), y vaya a "
+"Apariencia (o Iconos en el modo avanzado).\n"
+"Note que si hay demasiados iconos en el dock, éstos se reducirán para caber "
+"en la pantalla.\n"
+"También puede definir el tamaño individual de cada miniaplicación en sus "
+"configuraciones."
 
 #: ../data/messages:37
 msgid "Separating icons"
@@ -1515,8 +1547,8 @@
 msgid ""
 "You can close a window by middle-clicking on its icon (or from the menu)."
 msgstr ""
-"Puedes cerrar una ventana haciendo click medio sobre el icono (o desde el "
-"menú)"
+"Puede cerrar una ventana haciendo una pulsación central sobre su icono (o "
+"desde el menú)."
 
 #: ../data/messages:51
 msgid "Minimizing / restauring a window"
@@ -1636,7 +1668,7 @@
 
 #: ../data/messages:91
 msgid "Placing applets on your desktop"
-msgstr "Colocando complementos en tu escritorio"
+msgstr "Colocar miniaplicaciones en su escritorio"
 
 #: ../data/messages:93
 msgid ""
@@ -1644,10 +1676,13 @@
 "wherever on your desktop.\n"
 "To detach an applet from the dock, simply drag and drop it outside the dock."
 msgstr ""
+"Las miniaplicaciones pueden posicionarse en «desklets» que son ventanas "
+"pequeñas que pueden ubicarse en cualquier lugar de su escritorio.\n"
+"Para separar una miniaplicación del dock, simplemente arrástrela fuera de él."
 
 #: ../data/messages:95
 msgid "Moving desklets"
-msgstr ""
+msgstr "Moviendo desklets"
 
 #: ../data/messages:97
 msgid ""
@@ -1683,6 +1718,9 @@
 "applet, go to Desklet, and select the decoration you want (you can provide "
 "your own one)."
 msgstr ""
+"Los «desklets» pueden tener decoraciones. Para cambiar eso, abra la "
+"configuración de la miniaplicación, vaya a Desklet, y seleccione la "
+"decoración que desee (puede proporcionar la suya propia)."
 
 #: ../data/messages:107
 msgid "Useful Features"
@@ -1701,6 +1739,12 @@
 "When a task has been or is going to be scheduled, the applet will warn you "
 "(15mn before the event, and also 1 day before in the case of an anniversary)."
 msgstr ""
+"Active la miniaplicación Reloj.\n"
+"Al pulsar sobre él se abrirá un calendario.\n"
+"Al pulsar dos veces sobre él se abrirá un editor de tareas. Allí puede "
+"añadir o quitar tareas.\n"
+"Cuando una tarea ha sido o será programada, la miniaplicación le avisará "
+"(15min antes del evento, o un día antes en caso de un aniversario)."
 
 #: ../data/messages:113
 msgid "Having a list of all windows"
@@ -1736,6 +1780,9 @@
 "Activate the Show-Desktop applet.\n"
 "Right-click on it -> \"change resolution\" -> select the one you want."
 msgstr ""
+"Active la miniaplicación Mostrar escritorio.\n"
+"Pulse con el botón derecho en él ‣ «Cambiar resolución» ‣ seleccione la que "
+"desee.t"
 
 #: ../data/messages:125
 msgid "Locking your session"
@@ -2083,15 +2130,16 @@
 #: ../data/messages:229
 msgid "The «netspeed» applet displays 0 even when I'm downloading something"
 msgstr ""
-"El applet «Redrapidez» expone 0 incluso cuando estoy trasvasando algo."
+"La miniaplicación «Velocidad de red» muestra 0 aun cuando estoy descargando "
+"algo"
 
 #: ../data/messages:231
 msgid ""
 "Tip: you can run several instances of this applet if you wish to monitor "
 "several interfaces."
 msgstr ""
-"Pista: se puede iniciar este aplique varias veces si se desea controlar "
-"varias interfaces."
+"Consejo: puede ejecutar varias instancias de esta miniaplicación si quiere "
+"monitorear varias interfaces."
 
 #: ../data/messages:233
 msgid ""
@@ -2169,7 +2217,7 @@
 msgid ""
 "If you wish to develop an applet, a complete documentation is available here."
 msgstr ""
-"Si usted desea desarrollar un applet, una documentación completa está "
+"Si quiere desarrollar una miniaplicación, hay una completa documentación "
 "disponible aquí."
 
 #: ../data/messages:255
@@ -2182,9 +2230,10 @@
 "or to interact with the dock in any kind of way, a full DBus API is "
 "described here."
 msgstr ""
-"Si quieres crear un appelt con Python, Perl o cualquier otro lenguaje,\n"
-"o si quieres interactura con el dock por cualquira manera, un API DBus "
-"complete esta describido ahí."
+"Si quiere desarrollar una miniaplicación con Python, Perl o cualquier otro "
+"lenguaje,\n"
+"o quiere interactuar con el dock de otra manera, aquí está descrita una API "
+"completa de DBus."
 
 #: ../data/messages:259
 msgid "DBus API"
@@ -2214,7 +2263,7 @@
 
 #: ../data/messages:273
 msgid "More applets available online!"
-msgstr ""
+msgstr "Más miniaplicaiones disponibles en línea"
 
 #: ../data/messages:275
 msgid "Cairo-Dock-Plug-ins-Extras"
@@ -2316,15 +2365,15 @@
 
 #: ../data/messages:315
 msgid "Set to 0 to use the default applet size"
-msgstr "Establezca a 0 para usar el tamaño de aplique predeterminado"
+msgstr "Configure a 0 para usar el tamaño predeterminado de miniaplicación"
 
 #: ../data/messages:317
 msgid "Desired icon size for this applet"
-msgstr "Tamaño de icono deseado para este aplique"
+msgstr "Tamaño de icono deseado para esta miniaplicación"
 
 #: ../data/messages:319
 msgid "Applet's Handbook"
-msgstr "Manual del aplique"
+msgstr "Manual de la miniaplicación"
 
 #: ../data/messages:321
 msgid "Desklet"
@@ -2722,7 +2771,7 @@
 
 #: ../data/messages:523
 msgid "Add or remove any applet"
-msgstr "Agrega o remueve cualquier applet"
+msgstr "Añadir o quitar cualquier miniaplicación"
 
 #: ../data/messages:525
 msgid ""
@@ -2730,11 +2779,11 @@
 "Click on the left check-box to (de)activate an applet.\n"
 "Once an applet is active, you can configure it by right clicking on its icon."
 msgstr ""
-"Seleccione una línea para obtener una descripción y una vista previa de la "
-"mini-aplicación.\n"
-"Haga click en la casilla izquierda para (des)activar una miniaplicación.\n"
-"Una vez que la mini-aplicación está activa, puede configurarla haciendo "
-"click derecho en su icono"
+"Seleccione una línea para obtener una previsualización y descripción de la "
+"miniaplicación.\n"
+"Pulse en la casilla a la izquierda para (des)activar una miniaplicación.\n"
+"Una vez que la miniaplicación esté activa, puede configurarla haciendo una "
+"pulsación derecha sobre su icono."
 
 #: ../data/messages:527
 msgid ""
@@ -3346,6 +3395,8 @@
 #: ../data/messages:909
 msgid "Several applets can be visible even when the dock is hidden"
 msgstr ""
+"Algunas miniaplicaciones pueden permanecer visibles incluso cuando el dock "
+"está oculto"
 
 #: ../data/messages:911
 msgid "Default background color when the dock is hidden"

cairo-dock-3.0.1.tar.gz/po/et.po -> cairo-dock-3.0.2.tar.gz/po/et.po Changed

cairo-dock-3.0.1.tar.gz/po/eu.po -> cairo-dock-3.0.2.tar.gz/po/eu.po Changed

cairo-dock-3.0.1.tar.gz/po/fi.po -> cairo-dock-3.0.2.tar.gz/po/fi.po Changed

cairo-dock-3.0.1.tar.gz/po/fo.po -> cairo-dock-3.0.2.tar.gz/po/fo.po Changed

cairo-dock-3.0.1.tar.gz/po/fr.po -> cairo-dock-3.0.2.tar.gz/po/fr.po Changed

@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: 2.1.0\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-01 12:59+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-05-08 02:24+0000\n"
 "Last-Translator: Matthieu Baerts <matttbe@gmail.com>\n"
 "Language-Team: Cairo-Dock <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-05-09 04:40+0000\n"
+"X-Generator: Launchpad (build 15213)\n"
 "X-Poedit-Country: France\n"
 "Language: \n"
 "X-Poedit-Language: French\n"
@@ -437,6 +437,7 @@
 " Lentdormi https://launchpad.net/~dahr974\n"
 " Matthieu Baerts https://launchpad.net/~matttbe\n"
 " Nicolas Delvaux https://launchpad.net/~malizor\n"
+" Pierre Slamich https://launchpad.net/~pierre-slamich\n"
 " SQP https://launchpad.net/~sqp\n"
 " Thibault Févry https://launchpad.net/~thibaultfevry\n"
 " bouchard renaud https://launchpad.net/~renaud-bouchard\n"

cairo-dock-3.0.1.tar.gz/po/gl.po -> cairo-dock-3.0.2.tar.gz/po/gl.po Changed

cairo-dock-3.0.1.tar.gz/po/hu.po -> cairo-dock-3.0.2.tar.gz/po/hu.po Changed

@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:17+0000\n"
-"Last-Translator: Fabounet <fabounet03@gmail.com>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-22 13:19+0000\n"
+"Last-Translator: Péter Trombitás <trombipeti@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-23 04:42+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
 "Language: hu\n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -70,15 +70,15 @@
 
 #: ../src/cairo-dock-gui-commons.c:575
 msgid "Press the shortkey"
-msgstr ""
+msgstr "Nyomja meg a gyorsgombot"
 
 #: ../src/cairo-dock-gui-commons.c:594
 msgid "Change the shortkey"
-msgstr ""
+msgstr "Gyorsgomb megváltoztatása"
 
 #: ../src/cairo-dock-gui-commons.c:681
 msgid "Origin"
-msgstr ""
+msgstr "Forrás"
 
 #: ../src/cairo-dock-gui-commons.c:686
 msgid "Action"
@@ -86,7 +86,7 @@
 
 #: ../src/cairo-dock-gui-commons.c:690
 msgid "Shortkey"
-msgstr ""
+msgstr "Gyorsgomb"
 
 #: ../src/cairo-dock-gui-items.c:242
 msgid ""
@@ -154,7 +154,7 @@
 
 #: ../src/cairo-dock-gui-main.c:1502 ../data/messages:515 ../data/messages:767
 msgid "Shortkeys"
-msgstr ""
+msgstr "Gyorsgombok"
 
 #: ../src/cairo-dock-gui-main.c:1508
 msgid "All of the parameters you will never want to tweak."
@@ -441,6 +441,8 @@
 "Thanks to all people that help us to improve the Cairo-Dock project.\n"
 "Thanks to all current, former and future contributors."
 msgstr ""
+"Köszönet mindenkinek, aki segíti a Cairo-Dock projekt fejlődését.\n"
+"Köszönet minden jelenlegi, volt és jövendőbeli közreműködőnek."
 
 #: ../src/cairo-dock-menu.c:317
 msgid "How to help us?"
@@ -448,7 +450,7 @@
 
 #: ../src/cairo-dock-menu.c:318
 msgid "Don't hesitate to join the project, we need you ;)"
-msgstr ""
+msgstr "Ne habozzon, csatlakozzon most a projekthez, szükségünk van Önre!"
 
 #: ../src/cairo-dock-menu.c:319
 msgid "Former contributors"
@@ -460,7 +462,7 @@
 
 #: ../src/cairo-dock-menu.c:321
 msgid "Users of our forum"
-msgstr ""
+msgstr "A fórum felhasználói"
 
 #: ../src/cairo-dock-menu.c:322
 msgid "Artwork"
@@ -589,7 +591,7 @@
 
 #: ../src/cairo-dock-menu.c:898
 msgid "Lock icons position"
-msgstr ""
+msgstr "Ikonok helyzetének rögzítése"
 
 #: ../src/cairo-dock-menu.c:902
 msgid "This will (un)lock the position of the icons."

cairo-dock-3.0.1.tar.gz/po/id.po -> cairo-dock-3.0.2.tar.gz/po/id.po Changed

cairo-dock-3.0.1.tar.gz/po/it.po -> cairo-dock-3.0.2.tar.gz/po/it.po Changed

@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: 1.4.5\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:48+0000\n"
-"Last-Translator: Mattia Tavernini <maathias@interfree.it>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-06-03 11:35+0000\n"
+"Last-Translator: Wonderfulheart <Unknown>\n"
 "Language-Team: Italian <kde-i18n-it@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-04 04:35+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 "Language: it\n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -71,23 +71,23 @@
 
 #: ../src/cairo-dock-gui-commons.c:575
 msgid "Press the shortkey"
-msgstr ""
+msgstr "Premere il tasto scorciatoia"
 
 #: ../src/cairo-dock-gui-commons.c:594
 msgid "Change the shortkey"
-msgstr ""
+msgstr "Cambia il tasto scorciatoia"
 
 #: ../src/cairo-dock-gui-commons.c:681
 msgid "Origin"
-msgstr ""
+msgstr "Origine"
 
 #: ../src/cairo-dock-gui-commons.c:686
 msgid "Action"
-msgstr ""
+msgstr "Azione"
 
 #: ../src/cairo-dock-gui-commons.c:690
 msgid "Shortkey"
-msgstr ""
+msgstr "Tasto scorciatoia"
 
 #: ../src/cairo-dock-gui-items.c:242
 msgid ""
@@ -102,7 +102,7 @@
 
 #: ../src/cairo-dock-gui-items.c:878
 msgid "Remove this item"
-msgstr ""
+msgstr "Rimuovere questa voce"
 
 #: ../src/cairo-dock-gui-main.c:129 ../data/messages:665
 msgid "Behaviour"
@@ -153,11 +153,11 @@
 
 #: ../src/cairo-dock-gui-main.c:1501
 msgid "Define all the keyboard shortcuts currently available."
-msgstr ""
+msgstr "Rileva tutte le scorciatoie da tastiera attualmente disponibili."
 
 #: ../src/cairo-dock-gui-main.c:1502 ../data/messages:515 ../data/messages:767
 msgid "Shortkeys"
-msgstr ""
+msgstr "Tasti scorciatoia"
 
 #: ../src/cairo-dock-gui-main.c:1508
 msgid "All of the parameters you will never want to tweak."
@@ -315,7 +315,7 @@
 #: ../src/cairo-dock-gui-simple.c:797
 msgid ""
 "Click on an applet in order to have a preview and a description for it."
-msgstr "Clicca su di un'applet per averne un'anteprima e una sua descrizione"
+msgstr "Clicca su un'applet per avere un'anteprima e una sua descrizione."
 
 #: ../src/cairo-dock-gui-simple.c:823
 msgid "On mouse hover:"
@@ -348,8 +348,8 @@
 "powerful tool to customise your current theme."
 msgstr ""
 "La Modalità avanzata dà la possibilità di configurare ogni singolo parametro "
-"della dock. E' uno strumento potente per customizzare il tema attualmente in "
-"uso."
+"della dock. E' uno strumento potente per personalizzare il tema attualmente "
+"in uso."
 
 #: ../src/cairo-dock-gui-themes.c:149
 msgid "Importing theme ..."
@@ -387,24 +387,24 @@
 msgid ""
 "Support the people who spend countless hours to bring you the best dock ever."
 msgstr ""
-"Supporta le persone che spendono gratuitamente il loro tempo per consegnarti "
-"la migliore dock in assoluto."
+"Sostieni le persone che impiegano gratuitamente il loro tempo per "
+"consegnarti la migliore dock in assoluto."
 
 #: ../src/cairo-dock-menu.c:260
 msgid "Here is a list of the current developers and contributors"
-msgstr ""
+msgstr "Ecco una lista degli attuali sviluppatori e collaboratori"
 
 #: ../src/cairo-dock-menu.c:261
 msgid "Developers"
-msgstr ""
+msgstr "Sviluppatori"
 
 #: ../src/cairo-dock-menu.c:262
 msgid "Main developer and project leader"
-msgstr ""
+msgstr "Sviluppatore principale e Leader del Progetto"
 
 #: ../src/cairo-dock-menu.c:263
 msgid "Contributors / Hackers"
-msgstr ""
+msgstr "Collaboratori / Esperti"
 
 #: ../src/cairo-dock-menu.c:265
 msgid "Development"
@@ -412,23 +412,33 @@
 
 #: ../src/cairo-dock-menu.c:280
 msgid "Website"
-msgstr ""
+msgstr "Sito Web"
 
 #: ../src/cairo-dock-menu.c:281
 msgid "Beta-testing / Suggestions / Forum animation"
-msgstr ""
+msgstr "Beta-testing / Suggerimenti / Animazione Forum"
 
 #: ../src/cairo-dock-menu.c:282
 msgid "Translators for this language"
-msgstr ""
+msgstr "Traduttori nella lingua italiana"
 
 #: ../src/cairo-dock-menu.c:283
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 " Andrea Amoroso https://launchpad.net/~heiko81\n"
+" Andrea Calabrò https://launchpad.net/~mastropino\n"
+" Giampaolo Bozzali https://launchpad.net/~g.bozzali\n"
+" Loscuby https://launchpad.net/~scuby84\n"
+" Luca Vercelli https://launchpad.net/~luca-vercelli\n"
 " Mario Calabrese https://launchpad.net/~mario-calabrese\n"
-" Mattia Tavernini https://launchpad.net/~maathias"
+" Mattia Tavernini https://launchpad.net/~maathias\n"
+" Natale https://launchpad.net/~ngm270189\n"
+" Stefano Prenna https://launchpad.net/~stefanoprenna\n"
+" Wonderfulheart https://launchpad.net/~wonderfulheart\n"
+" bobol68 https://launchpad.net/~bobol68\n"
+" danielesil88 https://launchpad.net/~danielesil88\n"
+" yoruk https://launchpad.net/~yoruk87"
 
 #: ../src/cairo-dock-menu.c:285
 msgid "Support"
@@ -439,26 +449,29 @@
 "Thanks to all people that help us to improve the Cairo-Dock project.\n"
 "Thanks to all current, former and future contributors."
 msgstr ""
+"Grazie a tutte le persone che ci aiutano a migliorare il progetto Cairo-"
+"Dock.\n"
+"Grazie a tutti i collaboratori attuali, precedenti e futuri."
 
 #: ../src/cairo-dock-menu.c:317
 msgid "How to help us?"
-msgstr ""
+msgstr "Come aiutarci?"
 
 #: ../src/cairo-dock-menu.c:318
 msgid "Don't hesitate to join the project, we need you ;)"
-msgstr ""
+msgstr "Non esitare ad unirti al progetto, abbiamo bisogno di te ;)"
 
 #: ../src/cairo-dock-menu.c:319
 msgid "Former contributors"
-msgstr ""
+msgstr "Collaboratori di concetto"
 
 #: ../src/cairo-dock-menu.c:320
 msgid "For a complete list, please have a look to BZR logs"
-msgstr ""
+msgstr "Per una lista completa, per favore date uno sguardo ai log della BZR"
 
 #: ../src/cairo-dock-menu.c:321
 msgid "Users of our forum"
-msgstr ""
+msgstr "Utenti del nostro forum"
 
 #: ../src/cairo-dock-menu.c:322
 msgid "Artwork"
@@ -466,11 +479,11 @@
 
 #: ../src/cairo-dock-menu.c:324
 msgid "Thanks"
-msgstr ""
+msgstr "Ringraziamenti"
 
 #: ../src/cairo-dock-menu.c:401
 msgid "Quit Cairo-Dock?"
-msgstr "Esci da Cairo-Dock?"
+msgstr "Uscire da Cairo-Dock?"
 
 #: ../src/cairo-dock-menu.c:431 ../src/cairo-dock-menu.c:573
 msgid "Separator"
@@ -483,7 +496,7 @@
 "move to another dock"
 msgstr ""
 "La nuova dock è stata creata.\n"
-"Adesso sposta qualche lanciatore o applet su di lei con clic destro "
+"Adesso sposta qualche lanciatore o applet su di essa con clic destro "
 "sull'icona -> Sposta in un'altra dock"
 
 #: ../src/cairo-dock-menu.c:567
@@ -500,12 +513,12 @@
 
 #: ../src/cairo-dock-menu.c:575
 msgid "Custom launcher"
-msgstr "Lanciatori personalizzati"
+msgstr "Lanciatore personalizzato"
 
 #: ../src/cairo-dock-menu.c:576
 msgid ""
 "Usually you would drag a launcher from the menu and drop it on the dock."
-msgstr "Di solito trascineresti un lanciatore dal menu alla dock."
+msgstr "Di solito dovresti trascinare un lanciatore dal menu alla dock."
 
 #: ../src/cairo-dock-menu.c:593
 msgid "separator"
@@ -551,7 +564,7 @@
 #: ../src/cairo-dock-menu.c:795
 #, c-format
 msgid "You're about to remove this applet (%s) from the dock. Are you sure?"
-msgstr "Stai per rimuovere questo applet (%s) dalla dock. Sicuro?"
+msgstr "Stai per rimuovere questa applet (%s) dalla dock. Sei sicuro?"
 
 #: ../src/cairo-dock-menu.c:853
 msgid "Configure"
@@ -559,7 +572,7 @@
 
 #: ../src/cairo-dock-menu.c:858
 msgid "Configure behaviour, appearance, and applets."
-msgstr "Configura il comportamento, l'aspetto, e le applet."
+msgstr "Configura il comportamento, l'aspetto e le applet."
 
 #: ../src/cairo-dock-menu.c:863
 msgid "Configure this dock"
@@ -568,7 +581,7 @@
 #: ../src/cairo-dock-menu.c:868
 msgid "Customize the position, visibility and appearance of this main dock."
 msgstr ""
-"Personalizza la posizione, visibilità e apparenza della dock principale."
+"Personalizza la posizione, la visibilità e l'aspetto della dock principale."
 
 #: ../src/cairo-dock-menu.c:870
 msgid "Delete this dock"
@@ -582,12 +595,12 @@
 msgid ""
 "Choose from amongst many themes on the server or save your current theme."
 msgstr ""
-"Scegli uno tra i molti temi disponibili sul server, e salva il tuo tema "
+"Scegli tra uno dei molti temi disponibili sul server o salva il tuo tema "
 "corrente."
 
 #: ../src/cairo-dock-menu.c:898
 msgid "Lock icons position"
-msgstr ""
+msgstr "Blocca le icone"
 
 #: ../src/cairo-dock-menu.c:902
 msgid "This will (un)lock the position of the icons."
@@ -609,8 +622,8 @@
 msgid ""
 "Third-party applets provide integration with many programs, like Pidgin"
 msgstr ""
-"Le applet di terze-parti provvedono all'integrazione di molti programmi, "
-"come Pidgin"
+"Le applet di terze-parti forniscono un'integrazione a molti programmi, come "
+"Pidgin"
 
 #: ../src/cairo-dock-menu.c:961 ../src/help/applet-init.c:28
 #: ../src/help/applet-notifications.c:257
@@ -636,14 +649,17 @@
 "It's not advised to quit the dock but you can press Shift to unlock this "
 "menu entry."
 msgstr ""
+"Stai usando una sessione Cairo-Dock!\n"
+"Non è consigliato uscire dalla dock ma è possibile premere Shift per "
+"sbloccare questa voce del menu."
 
 #: ../src/cairo-dock-menu.c:1018 ../src/cairo-dock-menu.c:1039
 msgid "Edit"
-msgstr ""
+msgstr "Modifica"
 
 #: ../src/cairo-dock-menu.c:1020 ../src/cairo-dock-menu.c:1046
 msgid "Remove"
-msgstr ""
+msgstr "Elimina"
 
 #: ../src/cairo-dock-menu.c:1021
 msgid ""
@@ -666,7 +682,7 @@
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Detach"
-msgstr ""
+msgstr "Distacca"
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Return to the dock"
@@ -674,7 +690,7 @@
 
 #: ../src/cairo-dock-menu.c:1050
 msgid "Duplicate"
-msgstr ""
+msgstr "Duplica"
 
 #: ../src/cairo-dock-menu.c:1065
 msgid "Applet's handbook"
@@ -682,7 +698,7 @@
 
 #: ../src/cairo-dock-menu.c:1110
 msgid "Pick up an image"
-msgstr ""
+msgstr "Trovare un'immagine"
 
 #: ../src/cairo-dock-menu.c:1341
 #, c-format
@@ -778,7 +794,7 @@
 #: ../src/cairo-dock-menu.c:1666 ../src/cairo-dock-menu.c:1668
 #: ../data/messages:745
 msgid "Lower"
-msgstr ""
+msgstr "Arrotola"
 
 #: ../src/cairo-dock-menu.c:1674 ../src/cairo-dock-menu.c:1676
 #: ../data/messages:739
@@ -832,7 +848,7 @@
 "config.\n"
 "It is located in the 'Taskbar' module."
 msgstr ""
-"L'opzione ' sovrascrivi le icone di X' è stata automaticamente abilitata "
+"L'opzione 'sovrascrivi le icone di X' è stata automaticamente abilitata "
 "nella configurazione.\n"
 "E' rintracciabile nel modulo 'Taskbar'."
 
@@ -847,7 +863,7 @@
 
 #: ../src/cairo-dock.c:328
 msgid "Use OpenGL backend."
-msgstr "Usa il backend OpenGL"
+msgstr "Usa il backend OpenGL."
 
 #: ../src/cairo-dock.c:331
 msgid ""
@@ -859,7 +875,7 @@
 
 #: ../src/cairo-dock.c:334
 msgid "Ask again on startup which backend to use."
-msgstr ""
+msgstr "Chiedi nuovamente all'avvio quale backend usare."
 
 #: ../src/cairo-dock.c:337
 msgid "Force the dock to consider this environnement - use it with care."
@@ -870,7 +886,7 @@
 msgid ""
 "Force the dock to load from this directory, instead of ~/.config/cairo-dock."
 msgstr ""
-"Forza la dock a caricare da questa cartella, invece che da ~/.config/cairo-"
+"Forza la dock a caricare da questa directory, invece che da ~/.config/cairo-"
 "dock."
 
 #: ../src/cairo-dock.c:343
@@ -879,15 +895,15 @@
 "default server address."
 msgstr ""
 "Indirizzo di un server contenente temi addizionali. Questo sovrascriverà "
-"l'indirizzo server di default."
+"l'indirizzo del server predefinito."
 
 #: ../src/cairo-dock.c:346
 msgid ""
 "Wait for N seconds before starting; this is useful if you notice some "
 "problems when the dock starts with the session."
 msgstr ""
-"Attendi per N secondi prima di partire; questo è utile se sperimenti "
-"problemi quando la dock si avvia ad inizio sessione."
+"Attendi per N secondi prima di partire; questo è utile se hai problemi "
+"quando la dock si avvia ad inizio sessione."
 
 #: ../src/cairo-dock.c:349
 msgid ""
@@ -910,7 +926,7 @@
 msgid ""
 "Log verbosity (debug,message,warning,critical,error); default is warning."
 msgstr ""
-"Log verboso (debug,message,warning,critical,error); di base è solo warning."
+"Log prolisso (debug,message,warning,critical,error); di base è solo warning."
 
 #: ../src/cairo-dock.c:361
 msgid "Force to display some output messages with colors."
@@ -942,8 +958,8 @@
 "Ask the dock to load additionnal modules contained in this directory (though "
 "it is unsafe for your dock to load unnofficial modules)."
 msgstr ""
-"Domanda alla dock di caricare moduli addizionali contenuti in questa "
-"cartella (ricorda che non è sicuro per la tua dock, caricare moduli non "
+"Domanda alla dock di caricare i moduli addizionali contenuti in questa "
+"directory (sebbene non sia sicuro per la tua dock caricare moduli non "
 "ufficiali)."
 
 #: ../src/cairo-dock.c:383
@@ -951,20 +967,20 @@
 "For debugging purpose only. The crash manager will not be started to hunt "
 "down the bugs."
 msgstr ""
-"Per interessi di debug soltanto. Il manager dei crash non verrà avviato per "
-"ricercare gli errori."
+"Solo per interesse di debug. Il manager dei crash non sarà avviato per "
+"ricercare degli errori."
 
 #: ../src/cairo-dock.c:386
 msgid ""
 "For debugging purpose only. Some hidden and still unstable options will be "
 "activated."
 msgstr ""
-"Per interessi di debug soltanto. Qualche opzione ancora nascosta e instabile "
-"sarà attivata."
+"Solo per interesse di debug. Saranno attivate delle opzioni ancora nascoste "
+"ed instabili."
 
 #: ../src/cairo-dock.c:503
 msgid "Use OpenGL in Cairo-Dock"
-msgstr "Utilizza OpenGL in Cairo-Dock?"
+msgstr "Utilizza OpenGL in Cairo-Dock"
 
 #: ../src/cairo-dock.c:511
 msgid ""
@@ -983,10 +999,10 @@
 "In ogni caso, alcune schede video e/o i relativi driver non la supportano "
 "completamente, il che potrebbe causare un funzionamento non corretto della "
 "dock.\n"
-"Attiva OpenGL?\n"
+"Vuoi attivare OpenGL?\n"
 " (Per non mostrare questo avviso, lanciare la dock dal menu delle "
 "Applicazioni,\n"
-" oppure con l'opzione -o per forzare OpenGL e -c per forzare cairo.)"
+" oppure con l'opzione -o per forzare OpenGL e -c per forzare Cairo.)"
 
 #: ../src/cairo-dock.c:522
 msgid "Remember this choice"
@@ -1004,8 +1020,8 @@
 "at http://glx-dock.org"
 msgstr ""
 "Il modulo '%s' potrebbe avere incontrato un problema.\n"
-"E' stato riavviato con successo, ma è accaduto ancora; ti ringraziamo se lo "
-"riferisci su http://glx-dock.org"
+"E' stato riavviato con successo, ma se accade ancora, per favore, "
+"riferiscilo su http://glx-dock.org"
 
 #: ../src/gldit/cairo-dock-applet-facility.h:277
 msgid ""
@@ -1051,7 +1067,7 @@
 #: ../src/gldit/cairo-dock-dock-manager.c:1656
 #: ../src/gldit/cairo-dock-dock-manager.c:1757
 msgid "Pop up the main dock"
-msgstr ""
+msgstr "Fai apparire la Dock principale"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:243
 #, c-format
@@ -1060,7 +1076,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:255
 msgid "kB"
-msgstr "kB"
+msgstr "KB"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:257
 msgid "MB"
@@ -1088,11 +1104,11 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a file"
-msgstr ""
+msgstr "Trovare un file"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a directory"
-msgstr ""
+msgstr "Trovare una directory"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:984
 msgid "_Custom Icons_"
@@ -1135,7 +1151,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:2962
 msgid "Theme"
-msgstr "tema"
+msgstr "Tema"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:2975
 msgid "Rating"
@@ -1143,7 +1159,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:2981
 msgid "Sobriety"
-msgstr "sobrietà"
+msgstr "Sobrietà"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:3054
 msgid "link"
@@ -1151,7 +1167,7 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:3107
 msgid "Grab"
-msgstr "cattura"
+msgstr "Cattura"
 
 #: ../src/gldit/cairo-dock-struct.h:423
 msgid "Default"
@@ -1172,6 +1188,8 @@
 "Could not access remote file %s. Maybe the server is down.\n"
 "Please retry later or contact us at glx-dock.org."
 msgstr ""
+"Non posso accedere al file remoto %s. Il server potrebbe essere spento.\n"
+"Per favore prova più tardi o contattaci su glx-dock.org."
 
 #: ../src/gldit/cairo-dock-themes-manager.c:267
 #, c-format
@@ -1192,12 +1210,12 @@
 " (you can now click on this dialog to close it)"
 msgstr ""
 "Benvenuto in Cairo-Dock!\n"
-"Quest' applet è qui per aiutarti ad iniziare con l'utilizzo della dock; "
-"basta cliccarci sopra.\n"
-"Se hai delle domande/richieste/segnalazioni, per favore spendi una visita al "
+"Quest'applet è qui per aiutarti ad iniziare con l'utilizzo della dock; basta "
+"cliccarci sopra.\n"
+"Se hai delle domande/richieste/segnalazioni, per favore facci una visita al "
 "sito http://glx-dock.org.\n"
-"Speriamo tu gradisca questo software!\n"
-" (adesso puoi cliccare sul dialogo per chiuderlo)"
+"Speriamo che tu gradisca questo software!\n"
+" (adesso puoi cliccare su questo dialogo per chiuderlo)"
 
 #: ../src/help/applet-composite.c:160
 msgid "Don't ask me any more"
@@ -1390,7 +1408,7 @@
 
 #: ../data/messages:21
 msgid "Grouping icons into a sub-dock"
-msgstr "Ragruppare le icone in sub-dock"
+msgstr "Raggruppare le icone in una sub-dock"
 
 #: ../data/messages:23
 msgid ""
@@ -1465,13 +1483,13 @@
 "Also, you can define the size of each applet independently in their own "
 "settings."
 msgstr ""
-"Puoi rendere più grandi o più piccoli sia le icone che l'effetto zoom. Apri "
-"le impostazioni (clic destro -> Cairo-Dock -> Configura) e vai su Aspetto (o "
+"Puoi ingrandire o rimpicciolire sia le icone che l'effetto zoom. Apri le "
+"impostazioni (clic destro -> Cairo-Dock -> Configura) e vai su Aspetto (o "
 "Icone nella modalità avanzata).\n"
-"Considera che se ci saranno troppe icone sulla dock, queste verranno "
+"Considera che se ci saranno troppe icone sulla dock, esse verranno "
 "ridimensionate per adattarsi allo schermo.\n"
-"In più puoi definire la dimensione di ogni applet indipendentemente, "
-"attraverso le loro impostazioni."
+"Inoltre puoi definire la dimensione di ciascuna applet impostandone ognuna "
+"indipendentemente."
 
 #: ../data/messages:37
 msgid "Separating icons"
@@ -1964,8 +1982,8 @@
 "To remove a bookmark, right-click on its icon -> remove"
 msgstr ""
 "Attiva l'applet Scorciatoie.\n"
-"Successivamente ogni segnalibro delle cartelle (quelli che appaiono in "
-"Nautilus) sarà elencato in na sub-dock.\n"
+"Successivamente, ogni segnalibro delle cartelle (quelli che appaiono in "
+"Nautilus), sarà elencato in una sub-dock.\n"
 "Per aggiungere segnalibri, trascina semplicemente una cartella nell'icona "
 "dell'applet.\n"
 "Per rimuoverlo, clic destro sulla sua icona -> \"rimuovi\""
@@ -2146,10 +2164,10 @@
 "If the dock is running with OpenGL, try to disable it by launching the dock "
 "with «cairo-dock -c»."
 msgstr ""
-"Se hai una GeForce8, dovrai installare gli ultimi driver, perchè i "
-"precedenti avevano molti bug.\n"
+"Se hai una GeForce8, dovrai installare gli ultimi driver perché i precedenti "
+"avevano molti bug.\n"
 "Se la dock sta andando senza OpenGL, prova a ridurre il numero di icone "
-"sulla dock principale, oppure a ridurne la dimensione.\n"
+"sulla dock principale oppure a ridurne la dimensione.\n"
 "Se la dock va con OpenGL, prova a disattivarlo lanciandola con 'cairo-dock -"
 "c'."
 
@@ -2172,7 +2190,7 @@
 "cards can do this, as can more and more Intel cards. Most ATI cards do not "
 "support OpenGL2.0."
 msgstr ""
-"Occorre una scheda grafica con driver che supportino openGL2.0. La maggior "
+"Occorre una scheda grafica con driver che supportino OpenGL2.0. La maggior "
 "parte delle schede Nvidia lo fanno, sempre più schede Intel ne sono in "
 "grado. La maggior parte delle schede ATI invece non può farlo."
 
@@ -2241,7 +2259,7 @@
 "Se usi KDE, è possibile tu debba dirgli il percorso della cartella Cestino.\n"
 "Apri l'editor di configurazione, e riempi il percorso del cestino; "
 "probabilmente è ~/.local/share/Trash/files. Stai molto attento quando digiti "
-"un percorso qui!!! (Non inserire spazi nè caratteri invisibili)."
+"un percorso qui!!! (Non inserire spazi né caratteri invisibili)."
 
 #: ../data/messages:239
 msgid ""
@@ -2355,8 +2373,8 @@
 " One for stable releases and another which is updated weekly (unstable "
 "version)"
 msgstr ""
-"Manteniamo due repository per Debian, Ubuntu e altre Debian-derivate:\n"
-" Uno per la release stable e un altro aggiornato setttimanalmente (versione "
+"Manteniamo due repository per Debian, Ubuntu e altre derivate Debian:\n"
+" Uno per la release stable e un altro aggiornato settimanalmente (versione "
 "unstable)"
 
 #: ../data/messages:281
@@ -2425,7 +2443,7 @@
 
 #: ../data/messages:307
 msgid "Name of the dock it belongs to:"
-msgstr "Nome della dock al quale appartiene:"
+msgstr "Nome della dock alla quale appartiene:"
 
 #: ../data/messages:309
 msgid "Name of the icon as it will appear in its caption in the dock:"
@@ -2741,6 +2759,14 @@
 "Separated : Separate the taskbar from the launchers and only show windows "
 "that are on the current desktop."
 msgstr ""
+"Nessuna : Non mostrare le finestre aperte nella dock.\n"
+"Minimalista: Le applicazioni sono unite al proprio lanciatore, mostra solo "
+"le altre finestre se esse sono minimizzate (come nel MacOSX).\n"
+"Integrata : Le applicazioni sono unite al proprio lanciatore, mostra tutte "
+"le altre finestre, e i gruppi di esse, insieme nella sub-dock "
+"(predefinito).\n"
+"Separata : Separa la taskbar dai lanciatori e mostra solo le finestre che si "
+"trovano sulla scrivania corrente."
 
 #: ../data/messages:461
 msgid "Behaviour of the Taskbar:"
@@ -2748,35 +2774,35 @@
 
 #: ../data/messages:465
 msgid "Minimalistic"
-msgstr ""
+msgstr "Minimalista"
 
 #: ../data/messages:467
 msgid "Integrated"
-msgstr ""
+msgstr "Integrata"
 
 #: ../data/messages:469
 msgid "Separated"
-msgstr ""
+msgstr "Separata"
 
 #: ../data/messages:471 ../data/messages:679
 msgid "Place new icons"
-msgstr ""
+msgstr "Posiziona le nuove icone"
 
 #: ../data/messages:473 ../data/messages:681
 msgid "At the beginning of the dock"
-msgstr ""
+msgstr "All'inizio della dock"
 
 #: ../data/messages:475 ../data/messages:683
 msgid "Before the launchers"
-msgstr ""
+msgstr "Prima dei lanciatori"
 
 #: ../data/messages:477 ../data/messages:685
 msgid "After the launchers"
-msgstr ""
+msgstr "Dopo i lanciatori"
 
 #: ../data/messages:479 ../data/messages:687
 msgid "At the end of the dock"
-msgstr ""
+msgstr "Alla fine della dock"
 
 #: ../data/messages:481
 msgid "Icons' animations and effects"
@@ -2784,13 +2810,14 @@
 
 #: ../data/messages:483
 msgid "& On mouse hover:"
-msgstr ""
+msgstr "& Al passaggio del mouse:"
 
 #: ../data/messages:487
 msgid ""
 "&[Evaporate;Fade out;Explode;Break;Black Hole;Random] On "
 "appearance/disappearance:"
 msgstr ""
+"&[Evapora;Dissolve;Esplode;Rompe;Buco Nero;Casuale] Alla comparsa/scomparsa:"
 
 #: ../data/messages:493
 msgid "Choose a theme of icons :"
@@ -2834,7 +2861,7 @@
 
 #: ../data/messages:517 ../data/messages:769
 msgid "Keyboard shortcuts currently available"
-msgstr ""
+msgstr "Scorciatoie da tastiera attualmente disponibili"
 
 #: ../data/messages:519 ../data/messages:771
 msgid ""
@@ -2843,6 +2870,10 @@
 "Double-click on a line, and press the shortkey you want to use for the "
 "corresponding action."
 msgstr ""
+"Molte applet forniscono dei tasti scorciatoia per le loro azioni. Non appena "
+"un'applet viene attivata, le scorciatoie divengono disponibili.\n"
+"Fare doppio clic su una riga, quindi premere il tasto scorciatoia che volete "
+"usare per l'azione corrispondente."
 
 #: ../data/messages:521
 msgid "Add-ons"
@@ -2950,19 +2981,19 @@
 
 #: ../data/messages:613
 msgid "The higher, the faster the dock will appear"
-msgstr ""
+msgstr "Più alta è, più velocemente apparirà la dock"
 
 #: ../data/messages:615
 msgid "Callback sensitivity:"
-msgstr ""
+msgstr "Sensibilità di richiamo:"
 
 #: ../data/messages:617
 msgid "high"
-msgstr ""
+msgstr "alta"
 
 #: ../data/messages:619
 msgid "low"
-msgstr ""
+msgstr "bassa"
 
 #: ../data/messages:621
 msgid "How to call the dock back:"
@@ -3065,11 +3096,11 @@
 
 #: ../data/messages:689
 msgid "After a given icon"
-msgstr ""
+msgstr "Dopo una determinata icona"
 
 #: ../data/messages:691
 msgid "Place new icons after this one"
-msgstr ""
+msgstr "Posiziona le nuove icone dopo quest'ultima"
 
 #: ../data/messages:693
 msgid ""
@@ -3136,7 +3167,7 @@
 
 #: ../data/messages:721
 msgid "Transparency of icons whose window is minimised:"
-msgstr "Trasparenza dell'icona di cui la finestra è o non è minimizzata:"
+msgstr "Trasparenza dell'icona la cui finestra è o non è minimizzata:"
 
 #: ../data/messages:723 ../data/messages:885 ../data/messages:1005
 #: ../data/messages:1031 ../data/messages:1129
@@ -3293,11 +3324,11 @@
 
 #: ../data/messages:819
 msgid "&[15;60] Animation frequency for the OpenGL backend :"
-msgstr ""
+msgstr "&[15;60] Frequenza dell'animazione per il backend OpenGL:"
 
 #: ../data/messages:823
 msgid "*[15;50] Animation frequency for the Cairo backend :"
-msgstr ""
+msgstr "*[15;50] Frequenza dell'animazione per il backend Cairo:"
 
 #: ../data/messages:825
 msgid ""
@@ -3309,7 +3340,7 @@
 
 #: ../data/messages:827
 msgid "* Reflections should be calculated in real-time?"
-msgstr ""
+msgstr "* I riflessi dovrebbero essere calcolati in tempo reale?"
 
 # #################################
 # ########### cairo-dock.conf #############
@@ -3474,15 +3505,16 @@
 
 #: ../data/messages:907
 msgid "Background when hidden"
-msgstr ""
+msgstr "Oscurato quando nascosto"
 
 #: ../data/messages:909
 msgid "Several applets can be visible even when the dock is hidden"
 msgstr ""
+"Diverse applet possono essere visibili anche quando la dock è nascosta"
 
 #: ../data/messages:911
 msgid "Default background color when the dock is hidden"
-msgstr ""
+msgstr "Colore predefinito di sfondo quando la dock è nascosta"
 
 #: ../data/messages:913 ../data/messages:1363
 msgid "Stretch the dock to always fill the screen"
@@ -3559,7 +3591,7 @@
 
 #: ../data/messages:959
 msgid "Shape of the bubble:"
-msgstr "Forma delle notifich :"
+msgstr "Forma delle notifiche:"
 
 #: ../data/messages:961
 msgid "Text"
@@ -3737,7 +3769,7 @@
 
 #: ../data/messages:1065
 msgid "Icons' size at rest (width x height) :"
-msgstr ""
+msgstr "Dimensione delle icone a riposo (larghezza x altezza):"
 
 #: ../data/messages:1067
 msgid "Zoom effect"
@@ -3793,7 +3825,7 @@
 
 #: ../data/messages:1091
 msgid "Use an image."
-msgstr "Utilizza un immagine."
+msgstr "Utilizza un'immagine."
 
 #: ../data/messages:1093
 msgid "Flat separator"
@@ -3824,7 +3856,7 @@
 
 #: ../data/messages:1105
 msgid "Reflections"
-msgstr "Rifessi"
+msgstr "Riflessi"
 
 #: ../data/messages:1107
 msgid ""
@@ -4028,7 +4060,7 @@
 
 #: ../data/messages:1197
 msgid "Draw an emblem"
-msgstr "Disegna un'emblema"
+msgstr "Disegna un emblema"
 
 #: ../data/messages:1199
 msgid "Draw the sub-dock's icons as a stack"
@@ -4145,7 +4177,7 @@
 "If checked, the pattern will go from top to bottom, otherwise from left to "
 "right."
 msgstr ""
-"Se scelto il motivo andrà dall'alto in basso, altrimenti da sinistra a "
+"Se scelto, il motivo andrà dall'alto in basso, altrimenti da sinistra a "
 "destra."
 
 #: ../data/messages:1255
@@ -4162,7 +4194,7 @@
 
 #: ../data/messages:1261
 msgid "Use the same look as the labels?"
-msgstr "Utilzza lo stesso stile delle etichette?"
+msgstr "Utilizza lo stesso stile delle etichette?"
 
 #: ../data/messages:1265
 msgid "Background color:"
@@ -4182,7 +4214,7 @@
 
 #: ../data/messages:1325
 msgid "Tiny"
-msgstr ""
+msgstr "Piccolo"
 
 #: ../data/messages:1339
 msgid "Leave it empty to use the same view as the main dock."
@@ -4223,7 +4255,7 @@
 "Otherwise the current behaviour will be kept. This defines the dock's "
 "position, behavioural settings such as auto-hide, using taskbar or not, etc."
 msgstr ""
-"Altrimenti il comportamento attuale sarà conservato. E' tutto ciò che "
+"Altrimenti il comportamento attuale sarà conservato. E tutto ciò che "
 "riguarda la posizione della dock, i parametri di comportamento come l'auto-"
 "nascondimento, l'utilizzo della TaskBar o meno, etc."
 
@@ -4281,7 +4313,7 @@
 
 #: ../data/messages:1403 ../data/messages:1405
 msgid "Desktop Entry"
-msgstr "Elementi Scrivania"
+msgstr "Elementi della Scrivania"
 
 #: ../data/messages:1407
 msgid ""
@@ -4326,3 +4358,21 @@
 " - Few additions to the DBus API.\n"
 " - It's possible to donate to support the project!"
 msgstr ""
+"Nuova versione: GLX-Dock 3.0!\n"
+" - La taskbar è stata notevolmente migliorata.\n"
+" - L'applet Log out è stata riscritta, adesso consente il cambio "
+"utente.\n"
+" - Il controllo della dock dalla tastiera è ora più potente:\n"
+" - sono state aggiunte molte scorciatoie in diverse applet\n"
+" - potete attivare un lanciatore premendo una scorciatoia + il suo numero\n"
+" - ora le scorciatoie possono essere tutte gestite nella finestra di "
+"configurazione.\n"
+" - Il Sound Menu di Ubuntu è stato integrato dentro l'applet Sound-"
+"Control.\n"
+" - Una nuova applet Twitter vi permette di 'cinguettare' in un clic.\n"
+" - Una nuova applet per inibire il salvaschermo in un clic.\n"
+" - I separatori sono trasparenti al clic nella modalità 'Pannello'\n"
+" - Cairo-Dock adesso usa le GTK3, per una migliore integrazione "
+"nell'ambiente Gnome\n"
+" - Poche aggiunte alle API DBus.\n"
+" - E' possibile fare delle donazioni per sostenere il progetto!"

cairo-dock-3.0.1.tar.gz/po/ja.po -> cairo-dock-3.0.2.tar.gz/po/ja.po Changed

cairo-dock-3.0.1.tar.gz/po/ko.po -> cairo-dock-3.0.2.tar.gz/po/ko.po Changed

cairo-dock-3.0.1.tar.gz/po/nb.po -> cairo-dock-3.0.2.tar.gz/po/nb.po Changed

cairo-dock-3.0.1.tar.gz/po/nl.po -> cairo-dock-3.0.2.tar.gz/po/nl.po Changed

@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 21:20+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-06-03 19:40+0000\n"
 "Last-Translator: rob <linuxned@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:21+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-04 04:35+0000\n"
+"X-Generator: Launchpad (build 15353)\n"
 "Language: \n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -1219,8 +1219,8 @@
 "Do you want to activate it now?"
 msgstr ""
 "Om de zwarte achtergrond rond het dock kwijt te raken, dient u een composite-"
-"manager te activeren.\n"
-"Wilt u deze nu activeren?"
+"beheerder in te schakelen.\n"
+"Wilt u deze nu inschakelen?"
 
 #: ../src/help/applet-composite.c:177
 msgid ""
@@ -1267,7 +1267,7 @@
 
 #: ../src/help/applet-notifications.c:252
 msgid "Activate composite"
-msgstr "Composite activeren"
+msgstr "Composite inschakelen"
 
 #: ../src/help/applet-notifications.c:254
 msgid "Disable the gnome-panel"
@@ -1359,10 +1359,10 @@
 "and then just drag-and-drop the link of an applet into your dock."
 msgstr ""
 "Cairo-Dock heeft vele applets. Applets zijn kleine programma's die zich "
-"bevinden in het dock, bijvoorbeeld een uitlogknop\n"
+"bevinden in het dock, bijvoorbeeld een afmeldknop.\n"
 "Om nieuwe applets te activeren, opent u de instellingen (rechtermuisklik -> "
 "Cairo-Dock -> Configureren), gaat naar \"Extra's\" en vinkt het applet aan "
-"dat u wilt.\n"
+"dat u wilt gaan gebruiken.\n"
 "Als u meer applets wilt installeren, klikt u op de knop \"Meer applets\" "
 "(hierdoor wordt u verder geleid naar onze applets-website) en kunt applets "
 "installeren door de link van een applet naar uw dock te verslepen."
@@ -1821,7 +1821,7 @@
 "Right-click on it -> \"lock screen\".\n"
 "You can bind this action to the middle-click."
 msgstr ""
-"Activeer het applet \"Uitloggen\".\n"
+"Activeer het applet \"Afmelden\".\n"
 "Klik er met rechts op -> \"Beeldscherm vergrendelen\".\n"
 "U kunt deze actie verbinden aan een middelklik."
 
@@ -1855,10 +1855,10 @@
 "smooth.\n"
 "Clicking again on it will enable the Composite."
 msgstr ""
-"Activeer het applet \"Composite-Manager\".\n"
-"Klik op het icoon om composite uit te schakelen, waardoor het spelen van "
+"Activeer het applet \"Composite-beheer\".\n"
+"Klik op het pictogram om composite uit te schakelen, waardoor het spelen van "
 "games wat soepeler zal verlopen.\n"
-"Klik nog een keer op het icoon om composite weer in te schakelen."
+"Klik nog een keer op het pictogram om composite weer in te schakelen."
 
 #: ../data/messages:137
 msgid "Seeing the hourly weather forecast"
@@ -2131,8 +2131,8 @@
 "draaien.\n"
 "Als u XFCE of KDE gebruikt, dan kunt u composite inschakelen in de "
 "vensterbeheerder’s opties.\n"
-"Als u Gnome gebruikt, kunt u het inschakelen in Metacity op de volgende "
-"manier :\n"
+"Als u Gnome gebruikt, kunt u het in Metacity op de volgende manier "
+"inschakelen :\n"
 " Open de Configuratie-editor, bewerk de sleutel "
 "'/apps/metacity/general/compositing_manager' en vink het vakje onder "
 "´waarde´ aan."
@@ -3324,7 +3324,7 @@
 
 #: ../data/messages:789
 msgid "Number of steps in the zoom animation (grow/shrink):"
-msgstr "Aantal stappen voor wijzigen afmetingen icoon (groter/kleiner) :"
+msgstr "Aantal stappen voor wijzigen afmetingen pictogram (groter/kleiner) :"
 
 #: ../data/messages:801
 msgid "Number of steps in the auto-hide animation (move up/move down):"

cairo-dock-3.0.1.tar.gz/po/oc.po -> cairo-dock-3.0.2.tar.gz/po/oc.po Changed

cairo-dock-3.0.1.tar.gz/po/pl.po -> cairo-dock-3.0.2.tar.gz/po/pl.po Changed

@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-05 15:27+0000\n"
-"Last-Translator: Andrzej Król <andrzej.krol@poczta.onet.eu>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-17 23:22+0000\n"
+"Last-Translator: rasik <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:22+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-19 04:35+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 "Language: pl\n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -430,7 +430,8 @@
 " NINa https://launchpad.net/~factory\n"
 " Rafał Rudzik https://launchpad.net/~rrudzik\n"
 " Szymon Sieciński https://launchpad.net/~szymon-siecinski\n"
-" Wojciech Górnaś https://launchpad.net/~wojciech"
+" Wojciech Górnaś https://launchpad.net/~wojciech\n"
+" rasik https://launchpad.net/~rasik01"
 
 #: ../src/cairo-dock-menu.c:285
 msgid "Support"
@@ -686,7 +687,7 @@
 
 #: ../src/cairo-dock-menu.c:1110
 msgid "Pick up an image"
-msgstr ""
+msgstr "Odbierz obraz"
 
 #: ../src/cairo-dock-menu.c:1341
 #, c-format
@@ -1085,11 +1086,11 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a file"
-msgstr ""
+msgstr "Odbierz plik"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a directory"
-msgstr ""
+msgstr "Odbierz folder"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:984
 msgid "_Custom Icons_"
@@ -2579,6 +2580,8 @@
 "Image to be displayed above the drawings, e.g. a reflection. Leave empty for "
 "no image."
 msgstr ""
+"Obraz wyświetlany nad rysunkami, np odbicie. Pozostaw puste, gdy nie ma "
+"obrazu."
 
 #: ../data/messages:391
 msgid "Foreground image:"
@@ -2730,7 +2733,7 @@
 
 #: ../data/messages:471 ../data/messages:679
 msgid "Place new icons"
-msgstr ""
+msgstr "Umieść nowe ikony"
 
 #: ../data/messages:473 ../data/messages:681
 msgid "At the beginning of the dock"
@@ -2738,11 +2741,11 @@
 
 #: ../data/messages:475 ../data/messages:683
 msgid "Before the launchers"
-msgstr ""
+msgstr "Przed aktywatorami"
 
 #: ../data/messages:477 ../data/messages:685
 msgid "After the launchers"
-msgstr ""
+msgstr "Za aktywatorami"
 
 #: ../data/messages:479 ../data/messages:687
 msgid "At the end of the dock"
@@ -2914,7 +2917,7 @@
 
 #: ../data/messages:613
 msgid "The higher, the faster the dock will appear"
-msgstr ""
+msgstr "Im więcej, tym szybciej dock będzie się pojawiał"
 
 #: ../data/messages:615
 msgid "Callback sensitivity:"
@@ -3033,7 +3036,7 @@
 
 #: ../data/messages:691
 msgid "Place new icons after this one"
-msgstr ""
+msgstr "Umieść nowe ikony po tej"
 
 #: ../data/messages:693
 msgid ""

cairo-dock-3.0.1.tar.gz/po/pt.po -> cairo-dock-3.0.2.tar.gz/po/pt.po Changed

cairo-dock-3.0.1.tar.gz/po/pt_BR.po -> cairo-dock-3.0.2.tar.gz/po/pt_BR.po Changed

@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: 2.1.0-alpha\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:31+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-05-23 20:20+0000\n"
 "Last-Translator: Eduardo Mucelli Rezende Oliveira <edumucelli@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:23+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-05-24 10:36+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 "Language: \n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -643,6 +643,9 @@
 "It's not advised to quit the dock but you can press Shift to unlock this "
 "menu entry."
 msgstr ""
+"Você está usando uma sessão Cairo-Dock!\n"
+"Não é aconselhado sair do dock, mas você pode pressionar Shift para "
+"desbloquear este item do menu."
 
 #: ../src/cairo-dock-menu.c:1018 ../src/cairo-dock-menu.c:1039
 msgid "Edit"
@@ -891,12 +894,16 @@
 "Wait for N seconds before starting; this is useful if you notice some "
 "problems when the dock starts with the session."
 msgstr ""
+"Esperar por N segundos antes de executar; isto é útil se você perceber "
+"problemas quando o dock começa com a sessão."
 
 #: ../src/cairo-dock.c:349
 msgid ""
 "Allow to edit the config before the dock is started and show the config "
 "panel on start."
 msgstr ""
+"Permite editar a configuração antes de executar o dock e mostra o painel de "
+"configuração na inicialização."
 
 #: ../src/cairo-dock.c:352
 msgid "Exclude a given plug-in from activating (it is still loaded though)."
@@ -923,6 +930,7 @@
 #: ../src/cairo-dock.c:367
 msgid "Lock the dock so that any modification is impossible for users."
 msgstr ""
+"Bloquear o dock, assim qualquer modificação é impossível para os usuários."
 
 #: ../src/cairo-dock.c:371
 msgid "Keep the dock above other windows whatever."
@@ -1303,6 +1311,11 @@
 "Some applets let you bind a shortkey to an action, and decide which action "
 "sould be on middle-click."
 msgstr ""
+"A maioria dos ícones no dock tem várias ações: a primeira é clicando com o "
+"botão esquerdo do mouse, a segunda com o botão do meio e ações adicionais "
+"com o botão da direita (no menu).\n"
+"Alguns mini-aplicativos deixam você atribuir um atalho a uma ação, e decidir "
+"que ação usar com o botão do meio."
 
 #: ../data/messages:7
 msgid "Adding features"
@@ -1458,6 +1471,8 @@
 "You can launch an application several times by SHIFT+clicking on its icon "
 "(or from the menu)."
 msgstr ""
+"Você pode executar um aplicativo várias vezes usando SHIFT+clique no ícone "
+"(ou a partir do menu)."
 
 #: ../data/messages:59
 msgid "Switching between the windows of a same application"
@@ -1528,7 +1543,7 @@
 
 #: ../data/messages:85
 msgid "Hiding the dock to use all the screen"
-msgstr ""
+msgstr "Esconder o dock para usar a tela toda"
 
 #: ../data/messages:87
 msgid ""

cairo-dock-3.0.1.tar.gz/po/ro.po -> cairo-dock-3.0.2.tar.gz/po/ro.po Changed

cairo-dock-3.0.1.tar.gz/po/ru.po -> cairo-dock-3.0.2.tar.gz/po/ru.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: Cairo-Dock II\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-03 08:30+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-14 19:04+0000\n"
 "Last-Translator: Alex Nikolaenko <ceekay80@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:22+0000\n"
+"X-Launchpad-Export-Date: 2012-04-15 04:39+0000\n"
 "X-Generator: Launchpad (build 15070)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "Language: ru\n"
@@ -634,6 +634,9 @@
 "It's not advised to quit the dock but you can press Shift to unlock this "
 "menu entry."
 msgstr ""
+"У вас запущен Cairo-Dock!\n"
+"Не рекомендуется выходить, но вы можете зажать Shift, чтобы отобразить пункт "
+"меню."
 
 #: ../src/cairo-dock-menu.c:1018 ../src/cairo-dock-menu.c:1039
 msgid "Edit"

cairo-dock-3.0.1.tar.gz/po/sk.po -> cairo-dock-3.0.2.tar.gz/po/sk.po Changed

@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-04-06 10:31+0000\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-04-23 20:15+0000\n"
 "Last-Translator: milboy <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:22+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-24 04:42+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
 "Language: sk\n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -413,7 +413,7 @@
 
 #: ../src/cairo-dock-menu.c:281
 msgid "Beta-testing / Suggestions / Forum animation"
-msgstr ""
+msgstr "Beta testovanie / Návrhy / Fórum"
 
 #: ../src/cairo-dock-menu.c:282
 msgid "Translators for this language"
@@ -867,12 +867,16 @@
 "Address of a server containing additional themes. This will overwrite the "
 "default server address."
 msgstr ""
+"Adresa servera obsahujúca ďalšie témy. Toto prepíše predvolenú adresu "
+"servera."
 
 #: ../src/cairo-dock.c:346
 msgid ""
 "Wait for N seconds before starting; this is useful if you notice some "
 "problems when the dock starts with the session."
 msgstr ""
+"Počkať N sekúnd pred spustením, čo je vhodné, ak zistíte nejaké problémy pri "
+"spustení sedenia."
 
 #: ../src/cairo-dock.c:349
 msgid ""
@@ -926,6 +930,8 @@
 "Ask the dock to load additionnal modules contained in this directory (though "
 "it is unsafe for your dock to load unnofficial modules)."
 msgstr ""
+"Spýtať sa či majú byť načítatané moduly obsiahnuté v tomto adresári (nie je "
+"bezpečné spúšťať neoficiálne moduly)."
 
 #: ../src/cairo-dock.c:383
 msgid ""
@@ -1170,6 +1176,12 @@
 "Hope you will enjoy this soft !\n"
 " (you can now click on this dialog to close it)"
 msgstr ""
+"Víta vás Cairo-Dock!\n"
+"Tento aplet vám pomôže pri spustení panelu jednoduchým kliknutím.\n"
+"Ak máte otázky či otázky/požiadavky/poznámky, prosím podporte nás návštevou "
+"na http://glx-dock.org.\n"
+"Veríme, že si tento program užijete!\n"
+" (kliknutím na tento dialóg ho ukončíte)"
 
 #: ../src/help/applet-composite.c:160
 msgid "Don't ask me any more"
@@ -1450,13 +1462,15 @@
 
 #: ../data/messages:55
 msgid "Launching an application several times"
-msgstr ""
+msgstr "Viacnásobné spustenie aplikácie"
 
 #: ../data/messages:57
 msgid ""
 "You can launch an application several times by SHIFT+clicking on its icon "
 "(or from the menu)."
 msgstr ""
+"Aplikáciu môžete viacnásobne spustiť podržaním SHIFT + kliknutím na ikonu "
+"(alebo v menu)."
 
 #: ../data/messages:59
 msgid "Switching between the windows of a same application"
@@ -1470,7 +1484,7 @@
 
 #: ../data/messages:63
 msgid "Grouping windows of a given application"
-msgstr ""
+msgstr "Zoskupenie okien danej aplikácie"
 
 #: ../data/messages:65
 msgid ""
@@ -1497,6 +1511,8 @@
 "You need to run Compiz, and enable the \"Window Preview\" plug-in in Compiz. "
 "Install \"ccsm\" to be able to configure Compiz."
 msgstr ""
+"Je potrebné spustiť Compiz a povoliť rozšírenie \"náhľad okna\" v Compize. "
+"Nainštalujte \"ccsm\", aby ste nastavili Compiz."
 
 #: ../data/messages:75 ../data/messages:185 ../data/messages:205
 #: ../data/messages:243 ../data/messages:285 ../data/messages:289
@@ -1557,7 +1573,7 @@
 
 #: ../data/messages:95
 msgid "Moving desklets"
-msgstr ""
+msgstr "Premiestnenie deskletov"
 
 #: ../data/messages:97
 msgid ""
@@ -1567,10 +1583,14 @@
 "If you don't want to move it any more, you can lock its position by right-"
 "clicking on it -> \"lock position\". To unlock it, de-select this option."
 msgstr ""
+"Desklety môžete premiestňovať jednoducho myšou.\n"
+"Môžete nimi otáčať malými šípkami navrchu a na ľavej strane.\n"
+"Ak nechcete nimi pohybovať, uzamknite pozíciu pravým kliknutím -> \"lock "
+"position\". Odomknete odkliknutím tohto nastavenia."
 
 #: ../data/messages:99
 msgid "Placing desklets"
-msgstr ""
+msgstr "Umiestnenie deskletov"
 
 #: ../data/messages:101
 msgid ""
@@ -1585,7 +1605,7 @@
 
 #: ../data/messages:103
 msgid "Changing the desklets decorations"
-msgstr ""
+msgstr "Zmena ozdobenia deskletov"
 
 #: ../data/messages:105
 msgid ""
@@ -1593,14 +1613,16 @@
 "applet, go to Desklet, and select the decoration you want (you can provide "
 "your own one)."
 msgstr ""
+"Desklety môžu byť ozdobené. Pre zmenu otvorte nastavenie apletu, chodte do "
+"Deskletu a vyberte ozdobu akú chcete (môžete použiť aj vlastnú)"
 
 #: ../data/messages:107
 msgid "Useful Features"
-msgstr ""
+msgstr "Užitočné funkcie"
 
 #: ../data/messages:109
 msgid "Having a calendar with tasks"
-msgstr ""
+msgstr "Kalendár s plánovaním úloh"
 
 #: ../data/messages:111
 msgid ""
@@ -1614,7 +1636,7 @@
 
 #: ../data/messages:113
 msgid "Having a list of all windows"
-msgstr ""
+msgstr "Zoznam všetkých okien"
 
 #: ../data/messages:115
 msgid ""
@@ -1628,7 +1650,7 @@
 
 #: ../data/messages:117
 msgid "Showing all the desktops"
-msgstr ""
+msgstr "Zobraziť všetky plochy"
 
 #: ../data/messages:119
 msgid ""
@@ -1639,17 +1661,19 @@
 
 #: ../data/messages:121
 msgid "Changing the screen resolution"
-msgstr ""
+msgstr "Zmeniť rozlíšenie obrazovky"
 
 #: ../data/messages:123
 msgid ""
 "Activate the Show-Desktop applet.\n"
 "Right-click on it -> \"change resolution\" -> select the one you want."
 msgstr ""
+"Aktivovať aplet Zobraziť Plochu.\n"
+"Pravé kliknutie -> \"zmeniť rozlíšenie\" -> a vyberte také ktoré chcete."
 
 #: ../data/messages:125
 msgid "Locking your session"
-msgstr ""
+msgstr "Zamknúť vaše sedenie"
 
 #: ../data/messages:127
 msgid ""
@@ -1660,7 +1684,7 @@
 
 #: ../data/messages:129
 msgid "Quick-launching a program from keyboard (replacing ALT+F2)"
-msgstr ""
+msgstr "Rýchle spustenie programu (nahrádza ALT+F2)"
 
 #: ../data/messages:131
 msgid ""
@@ -1673,7 +1697,7 @@
 
 #: ../data/messages:133
 msgid "Turning Composite OFF during games"
-msgstr ""
+msgstr "Vypnúť kompozitné efekty počas hier"
 
 #: ../data/messages:135
 msgid ""
@@ -1682,10 +1706,13 @@
 "smooth.\n"
 "Clicking again on it will enable the Composite."
 msgstr ""
+"Aktivácia apletu kompozitného správcu.\n"
+"Kliknutím na neho zakáže kompozíciu, čo spôsobí, že hry pôjdu hladšie.\n"
+"Kliknutím na neho opäť umožní kompozíciu."
 
 #: ../data/messages:137
 msgid "Seeing the hourly weather forecast"
-msgstr ""
+msgstr "Pohľad na hodinovú predpoveď počasia"
 
 #: ../data/messages:139
 msgid ""
@@ -1699,7 +1726,7 @@
 
 #: ../data/messages:141
 msgid "Adding a file or a web page into the dock"
-msgstr ""
+msgstr "Pridanie súboru alebo webstránky do panelu"
 
 #: ../data/messages:143
 msgid ""
@@ -1713,7 +1740,7 @@
 
 #: ../data/messages:145
 msgid "Importing a folder into the dock"
-msgstr ""
+msgstr "Importovanie priečinka do panela"
 
 #: ../data/messages:147
 msgid ""
@@ -1724,7 +1751,7 @@
 
 #: ../data/messages:149
 msgid "Accessing the recent events"
-msgstr ""
+msgstr "Prístup k nedávnym udalostiam"
 
 #: ../data/messages:151
 msgid ""
@@ -1738,7 +1765,7 @@
 
 #: ../data/messages:153
 msgid "Quickly opening a recent file with a launcher"
-msgstr ""
+msgstr "Rýchle otvorenie nedávno použitého súboru spúšťačom"
 
 #: ../data/messages:155
 msgid ""
@@ -1751,7 +1778,7 @@
 
 #: ../data/messages:157
 msgid "Accessing disks"
-msgstr ""
+msgstr "Prístup k diskom"
 
 #: ../data/messages:159
 msgid ""
@@ -1763,7 +1790,7 @@
 
 #: ../data/messages:161
 msgid "Accessing folder bookmarks"
-msgstr ""
+msgstr "Prístup k záložkám priečinkov"
 
 #: ../data/messages:163
 msgid ""
@@ -1776,7 +1803,7 @@
 
 #: ../data/messages:165
 msgid "Having multiple instances of an applet"
-msgstr ""
+msgstr "Viac inštancií apletu"
 
 #: ../data/messages:167
 msgid ""
@@ -1790,7 +1817,7 @@
 
 #: ../data/messages:169
 msgid "Adding / removing a desktop"
-msgstr ""
+msgstr "Pridanie / odstránenie plochy"
 
 #: ../data/messages:171
 msgid ""
@@ -1798,10 +1825,14 @@
 "Right-click on it -> \"add a desktop\" or \"remove this desktop\".\n"
 "You can even name each of them."
 msgstr ""
+"Aktivácia apletu prepínač.\n"
+"Kliknutím pravým tlačidlom myši na neho -> \"Pridať plochu\" alebo "
+"\"odstrániť túto plochu\".\n"
+"Každú z nich si môžete pomenovať inak."
 
 #: ../data/messages:173
 msgid "Controling the sound volume"
-msgstr ""
+msgstr "Ovládanie hlasitosti"
 
 #: ../data/messages:175
 msgid ""
@@ -1813,7 +1844,7 @@
 
 #: ../data/messages:177
 msgid "Controling the screen brightness"
-msgstr ""
+msgstr "Ovládanie jasu obrazovky"
 
 #: ../data/messages:179
 msgid ""
@@ -1824,7 +1855,7 @@
 
 #: ../data/messages:181
 msgid "Removing completely the gnome-panel"
-msgstr ""
+msgstr "Úplne odstrániť gnome panel"
 
 #: ../data/messages:183
 msgid ""
@@ -1834,12 +1865,19 @@
 "Then restart your session : the gnome-panel has not been started, and the "
 "dock has been started (if not, you can add it to the startup programs)."
 msgstr ""
+"Otvorte gconf-editor, upravte kľúč "
+"/desktop/gnome/sesion/required_components/panel, a nahradte jeho obsah s "
+"\"cairo-dock\".\n"
+"Reštartujte sedenie: gnome-panel sa nespustí, a panel bude spustený (ak nie, "
+"pridajte do programov po spustení)."
 
 #: ../data/messages:187
 msgid ""
 "If you are on Gnome, you can click on this button in order to automatically "
 "modify this key:"
 msgstr ""
+"Ak používate Gnome, kliknutím na toto tlačítko automaticky upravíte tento "
+"kľúč:"
 
 #: ../data/messages:189
 msgid "Troubleshooting"
@@ -1896,6 +1934,7 @@
 "If you're on Gnome with Metacity (without Compiz), you can click on this "
 "button:"
 msgstr ""
+"Ak používate Gnome s metacity (bez Compizu), môžete kliknúť na toto tlačítko:"
 
 #: ../data/messages:209
 msgid "My machine is too old to run a composite manager."
@@ -2037,11 +2076,11 @@
 
 #: ../data/messages:245
 msgid "If you're on Gnome you can click on this button:"
-msgstr ""
+msgstr "Ak používate Gnome môžete kliknúť na toto tlačítko:"
 
 #: ../data/messages:247
 msgid "The Project"
-msgstr ""
+msgstr "Projekt"
 
 #: ../data/messages:249
 msgid "Join the project!"
@@ -2066,7 +2105,7 @@
 
 #: ../data/messages:255
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentácia"
 
 #: ../data/messages:257
 msgid ""
@@ -2088,10 +2127,13 @@
 "\n"
 "The Cairo-Dock Team"
 msgstr ""
+"\n"
+"\n"
+"Skupina Cairo-Dock"
 
 #: ../data/messages:263
 msgid "Websites"
-msgstr ""
+msgstr "Webové stránky"
 
 #: ../data/messages:265
 msgid "Problems? Suggestions? Just want to talk to us? Come on over!"
@@ -2103,7 +2145,7 @@
 
 #: ../data/messages:273
 msgid "More applets available online!"
-msgstr ""
+msgstr "Viac apletov je k dispozícii online!"
 
 #: ../data/messages:275
 msgid "Cairo-Dock-Plug-ins-Extras"
@@ -2111,7 +2153,7 @@
 
 #: ../data/messages:277
 msgid "Repositories"
-msgstr ""
+msgstr "Repozitáre"
 
 #: ../data/messages:279
 msgid ""
@@ -2122,11 +2164,11 @@
 
 #: ../data/messages:281
 msgid "Debian/Ubuntu"
-msgstr ""
+msgstr "Debian/Ubuntu"
 
 #: ../data/messages:283
 msgid "Ubuntu"
-msgstr ""
+msgstr "Ubuntu"
 
 #: ../data/messages:287
 msgid ""
@@ -2135,6 +2177,10 @@
 " After that, you can launch your update manager in order to install the "
 "latest stable version."
 msgstr ""
+"Ak používate Ubuntu, môžete pridať náš 'stabilný' zdroj softvéru kliknutím "
+"na toto tlačítko:\n"
+" Potom, môžete spustiť Správcu Aktualizácií pre inštaláciu najnovšej "
+"stabilnej verzie."
 
 #: ../data/messages:291
 msgid ""
@@ -2143,10 +2189,14 @@
 " After that, you can launch your update manager in order to install the "
 "latest weekly version."
 msgstr ""
+"Ak používate Ubuntu, môžete pridať náš 'týždenný' zdroj softvéru kliknutím "
+"na toto tlačítko:\n"
+" Potom, môžete spustiť Správcu Aktualizácií pre inštaláciu najnovšej "
+"týždennej verzie."
 
 #: ../data/messages:293
 msgid "Debian"
-msgstr ""
+msgstr "Debian"
 
 #: ../data/messages:297
 msgid ""
@@ -2155,6 +2205,10 @@
 " After that, you can purge all 'cairo-dock*' packages, update the your "
 "system and reinstall 'cairo-dock' package."
 msgstr ""
+"Ak používate Debian stable, môžete pridať náš 'stabilný' zdroj softvéru "
+"kliknutím na toto tlačítko:\n"
+" Potom, môžete môžete vymazať všetky 'cairo-dock *' balíčky, aktualizujte "
+"svoj systém a preinštalujte cairo-dock."
 
 #: ../data/messages:301
 msgid ""
@@ -2163,38 +2217,42 @@
 " After that, you can purge all 'cairo-dock*' packages, update the your "
 "system and reinstall 'cairo-dock' package."
 msgstr ""
+"Ak používate Debian Unstable, môžete pridať náš 'stabilný' zdroj softvéru "
+"kliknutím na toto tlačítko:\n"
+" Potom, môžete môžete vymazať všetky 'cairo-dock *' balíčky, aktualizujte "
+"svoj systém a preinštalujte cairo-dock."
 
 #: ../data/messages:303 ../data/messages:305
 msgid "Icon"
-msgstr ""
+msgstr "Ikona"
 
 #: ../data/messages:307
 msgid "Name of the dock it belongs to:"
-msgstr ""
+msgstr "Názov panela ku ktorému patrí :"
 
 #: ../data/messages:309
 msgid "Name of the icon as it will appear in its caption in the dock:"
-msgstr ""
+msgstr "Názov ikony, ktorá sa objaví na štítku v paneli :"
 
 #: ../data/messages:311
 msgid "Leave empty to use the default one."
-msgstr ""
+msgstr "Ponechať prázdne a použiť predvolené."
 
 #: ../data/messages:313
 msgid "Image filename:"
-msgstr ""
+msgstr "Názov súboru obrázku :"
 
 #: ../data/messages:315
 msgid "Set to 0 to use the default applet size"
-msgstr ""
+msgstr "Nastavte na 0 pre použitie predvolenej veľkosti appletu"
 
 #: ../data/messages:317
 msgid "Desired icon size for this applet"
-msgstr ""
+msgstr "Požadovaná veľkosť ikony pre tento applet"
 
 #: ../data/messages:319
 msgid "Applet's Handbook"
-msgstr ""
+msgstr "Príručka apletov"
 
 #: ../data/messages:321
 msgid "Desklet"
@@ -2205,50 +2263,60 @@
 "If locked, the desklet cannot be moved by simply dragging it with the left "
 "mouse button. It can still be moved with ALT + left-click."
 msgstr ""
+"Ak je je zamknutý, nedá sa deskletom pohybovať ťahaním ľavým tlačítkom myši. "
+"Samozrejme s ním stále môžete pohybovať kombináciou ALT + ľavé tlačítko myši."
 
 #: ../data/messages:327
 msgid "Lock position?"
-msgstr ""
+msgstr "Zamknúť pozíciu ?"
 
 #: ../data/messages:329
 msgid ""
 "Depending on your WindowManager, you may be able to resize this with ALT + "
 "middle-click or ALT + left-click."
 msgstr ""
+"V závislosti na manažérovi vašich okien, môžete zmeniť jeho veľkosť s ALT + "
+"stredné_klik alebo ALT + ľavé_klik napr."
 
 #: ../data/messages:331
 msgid "Desklet dimensions (width x height):"
-msgstr ""
+msgstr "Rozmery deskletov (šírka x výška) :"
 
 #: ../data/messages:333
 msgid ""
 "Depending on your WindowManager, you may be able to move this with ALT + "
 "left-click.. Negative values are counted from the right/bottom of the screen"
 msgstr ""
+"V závislosti na vašom správcovi okien, budete môcť pohybovať pomocou ALT + "
+"ľavé tlačidlo.. Záporné hodnoty sú počítané z pravej/dolnej časti obrazovky"
 
 #: ../data/messages:335
 msgid "Desklet position (x, y):"
-msgstr ""
+msgstr "Pozícia deskletu (x ; y) :"
 
 #: ../data/messages:337
 msgid ""
 "You can quickly rotate the desklet with the mouse, by dragging the little "
 "buttons on its left and top sides."
 msgstr ""
+"Môžete rýchlo otočiť deskletom s myšou, ťahaním malého tlačidla na ľavej a "
+"hornej strane."
 
 #: ../data/messages:339
 msgid "Rotation:"
-msgstr ""
+msgstr "Otočenie:"
 
 #: ../data/messages:343
 msgid "Is detached from the dock"
-msgstr ""
+msgstr "Je oddelený od panelu ?"
 
 #: ../data/messages:345
 msgid ""
 "for CompizFusion's \"widget layer\", set behaviour in Compiz to: "
 "(class=Cairo-dock & type=Utility)"
 msgstr ""
+"pre CompizFusion's \"widget layer\", nastaviť správanie Compiz na: "
+"(class=Cairo-dock & type=utility)"
 
 #: ../data/messages:347 ../data/messages:413 ../data/messages:451
 #: ../data/messages:583 ../data/messages:649 ../data/messages:1303
@@ -2257,15 +2325,15 @@
 
 #: ../data/messages:353
 msgid "Keep below"
-msgstr ""
+msgstr "Ponechať na pozadí"
 
 #: ../data/messages:355
 msgid "Keep on widget layer"
-msgstr ""
+msgstr "Ponechať na vrstve widgetu"
 
 #: ../data/messages:359
 msgid "Should be visible on all desktops?"
-msgstr ""
+msgstr "Má byť viditeľný na všetkých plochách ?"
 
 #: ../data/messages:361 ../data/messages:991
 msgid "Decorations"
@@ -2274,69 +2342,74 @@
 #: ../data/messages:363
 msgid "Choose 'Custom decorations' to define your own decorations below."
 msgstr ""
+"Vyberte 'vlastné dekorácie' pre možnosť definovať si vlastné ozdoby nižšie."
 
 #: ../data/messages:365
 msgid "Choose a decoration theme for this desklet:"
-msgstr ""
+msgstr "Vyberte ozdobu témy pre tento desklet :"
 
 #: ../data/messages:367
 msgid ""
 "Image to be displayed below drawings, e.g. a frame. Leave empty for no image."
 msgstr ""
+"Je to obrázok, ktorý se zobrazí pod kresbami, ako napríklad rámček. Ak "
+"žiadny nechcete, nechajte nevyplnené."
 
 #: ../data/messages:369
 msgid "Background image:"
-msgstr ""
+msgstr "Obrázok pozadia:"
 
 #: ../data/messages:371
 msgid "Background transparency:"
-msgstr ""
+msgstr "Priehľadnosť pozadia:"
 
 #: ../data/messages:373
 msgid "in pixels. Use this to adjust the left position of drawings."
-msgstr ""
+msgstr "v pixeloch. Použite pre nastavenie ľavej polohy vykreslenia."
 
 #: ../data/messages:375
 msgid "Left offset:"
-msgstr ""
+msgstr "Odsadenie zľava :"
 
 #: ../data/messages:377
 msgid "in pixels. Use this to adjust the top position of drawings."
-msgstr ""
+msgstr "v pixeloch. Použite pre nastavenie hornej polohy vykreslenia."
 
 #: ../data/messages:379
 msgid "Top offset:"
-msgstr ""
+msgstr "Odsadenie zhora :"
 
 #: ../data/messages:381
 msgid "in pixels. Use this to adjust the right position of drawings."
-msgstr ""
+msgstr "v pixeloch. Použite pre nastavenie pravej polohy vykreslenia."
 
 #: ../data/messages:383
 msgid "Right offset:"
-msgstr ""
+msgstr "Odsadenie vpravo :"
 
 #: ../data/messages:385
 msgid "in pixels. Use this to adjust the bottom position of drawings."
-msgstr ""
+msgstr "v pixeloch. Použite pre nastavenie dolnej polohy vykreslenia."
 
 #: ../data/messages:387
 msgid "Bottom offset:"
-msgstr ""
+msgstr "Odsadenie zdola"
 
 #: ../data/messages:389
 msgid ""
 "Image to be displayed above the drawings, e.g. a reflection. Leave empty for "
 "no image."
 msgstr ""
+"Je to obrázok, ktorý sa zobrazí nad kresbami, ako napríklad odraz. Ak žiadny "
+"nechcete, nevyplňujte."
 
 #: ../data/messages:391
 msgid "Foreground image:"
-msgstr ""
+msgstr "Obrázok popredia :"
 
 #: ../data/messages:393
 msgid "Foreground tansparency:"
-msgstr ""
+msgstr "Priehľadné popredie :"
 
 #: ../data/messages:395 ../data/messages:1267
 msgid "Behavior"
@@ -2461,35 +2534,35 @@
 
 #: ../data/messages:465
 msgid "Minimalistic"
-msgstr ""
+msgstr "Minimalistické"
 
 #: ../data/messages:467
 msgid "Integrated"
-msgstr ""
+msgstr "Integrované"
 
 #: ../data/messages:469
 msgid "Separated"
-msgstr ""
+msgstr "Oddelené"
 
 #: ../data/messages:471 ../data/messages:679
 msgid "Place new icons"
-msgstr ""
+msgstr "Umiestniť nové ikony"
 
 #: ../data/messages:473 ../data/messages:681
 msgid "At the beginning of the dock"
-msgstr ""
+msgstr "Na začiatku panela"
 
 #: ../data/messages:475 ../data/messages:683
 msgid "Before the launchers"
-msgstr ""
+msgstr "Pred spúšťačmi"
 
 #: ../data/messages:477 ../data/messages:685
 msgid "After the launchers"
-msgstr ""
+msgstr "Po spúšťačoch"
 
 #: ../data/messages:479 ../data/messages:687
 msgid "At the end of the dock"
-msgstr ""
+msgstr "Na konci panela"
 
 #: ../data/messages:481
 msgid "Icons' animations and effects"
@@ -2547,7 +2620,7 @@
 
 #: ../data/messages:517 ../data/messages:769
 msgid "Keyboard shortcuts currently available"
-msgstr ""
+msgstr "Aktuálne dostupné klávesové skratky"
 
 #: ../data/messages:519 ../data/messages:771
 msgid ""
@@ -2563,7 +2636,7 @@
 
 #: ../data/messages:523
 msgid "Add or remove any applet"
-msgstr ""
+msgstr "Pridať alebo odstrániť aplet"
 
 #: ../data/messages:525
 msgid ""
@@ -2662,7 +2735,7 @@
 
 #: ../data/messages:613
 msgid "The higher, the faster the dock will appear"
-msgstr ""
+msgstr "Čím vyššie, tým rýchlejšie sa panel objaví"
 
 #: ../data/messages:615
 msgid "Callback sensitivity:"
@@ -2670,11 +2743,11 @@
 
 #: ../data/messages:617
 msgid "high"
-msgstr ""
+msgstr "vysoká"
 
 #: ../data/messages:619
 msgid "low"
-msgstr ""
+msgstr "nízka"
 
 #: ../data/messages:621
 msgid "How to call the dock back:"
@@ -2881,7 +2954,7 @@
 
 #: ../data/messages:737
 msgid "Nothing"
-msgstr ""
+msgstr "Nič"
 
 #: ../data/messages:741
 msgid "Minimize"
@@ -2904,7 +2977,7 @@
 
 #: ../data/messages:751
 msgid "Only if your Window Manager supports it."
-msgstr ""
+msgstr "Iba ak to podporuje váš správca okien."
 
 #: ../data/messages:753
 msgid ""
@@ -3171,15 +3244,15 @@
 
 #: ../data/messages:907
 msgid "Background when hidden"
-msgstr ""
+msgstr "Pozadie pri skrytí"
 
 #: ../data/messages:909
 msgid "Several applets can be visible even when the dock is hidden"
-msgstr ""
+msgstr "Niektoré aplety môžu byť viditeľné aj ked je panel skrytý"
 
 #: ../data/messages:911
 msgid "Default background color when the dock is hidden"
-msgstr ""
+msgstr "Predvolené pozadie pri skrytí panela"
 
 #: ../data/messages:913 ../data/messages:1363
 msgid "Stretch the dock to always fill the screen"
@@ -3240,7 +3313,7 @@
 
 #: ../data/messages:951
 msgid "larger"
-msgstr ""
+msgstr "väčšie"
 
 #: ../data/messages:953
 msgid "Dialogs"
@@ -3425,7 +3498,7 @@
 
 #: ../data/messages:1065
 msgid "Icons' size at rest (width x height) :"
-msgstr ""
+msgstr "Veľkosť ikon v pokoji (šírka x výška):"
 
 #: ../data/messages:1067
 msgid "Zoom effect"
@@ -3704,7 +3777,7 @@
 
 #: ../data/messages:1197
 msgid "Draw an emblem"
-msgstr ""
+msgstr "Nakresliť znak"
 
 #: ../data/messages:1199
 msgid "Draw the sub-dock's icons as a stack"
@@ -3824,19 +3897,19 @@
 
 #: ../data/messages:1257
 msgid "Quick-info are short information drawn on the icons."
-msgstr ""
+msgstr "Krátke info je krátka informácia vykreslená nad ikonami."
 
 #: ../data/messages:1259
 msgid "Quick-info"
-msgstr ""
+msgstr "Krátke-info"
 
 #: ../data/messages:1261
 msgid "Use the same look as the labels?"
-msgstr ""
+msgstr "Použiť rovnaký vzhľad ako štítky?"
 
 #: ../data/messages:1265
 msgid "Background color:"
-msgstr ""
+msgstr "Farba pozadia:"
 
 #: ../data/messages:1295
 msgid "starting from 0"
@@ -3844,15 +3917,15 @@
 
 #: ../data/messages:1299
 msgid "Visibility of the dock"
-msgstr ""
+msgstr "Viditeľnosť panela"
 
 #: ../data/messages:1323 ../data/messages:1347
 msgid "Same as main dock"
-msgstr ""
+msgstr "Rovnako ako hlavný panel"
 
 #: ../data/messages:1325
 msgid "Tiny"
-msgstr ""
+msgstr "Drobné"
 
 #: ../data/messages:1339
 msgid "Leave it empty to use the same view as the main dock."

cairo-dock-3.0.1.tar.gz/po/sl.po -> cairo-dock-3.0.2.tar.gz/po/sl.po Changed

cairo-dock-3.0.1.tar.gz/po/sr.po -> cairo-dock-3.0.2.tar.gz/po/sr.po Changed

cairo-dock-3.0.1.tar.gz/po/sv.po -> cairo-dock-3.0.2.tar.gz/po/sv.po Changed

cairo-dock-3.0.1.tar.gz/po/tr.po -> cairo-dock-3.0.2.tar.gz/po/tr.po Changed

cairo-dock-3.0.1.tar.gz/po/uk.po -> cairo-dock-3.0.2.tar.gz/po/uk.po Changed

@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: Cairo-Dock II\n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-21 02:56+0000\n"
-"Last-Translator: Maks Mokriev <mcree@ukr.net>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-06-14 06:32+0000\n"
+"Last-Translator: ma$terok <Unknown>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:22+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-15 04:40+0000\n"
+"X-Generator: Launchpad (build 15414)\n"
 "X-Poedit-Country: Ukraine\n"
 "Language: uk\n"
 "X-Poedit-Language: Ukrainian\n"
@@ -392,7 +392,7 @@
 
 #: ../src/cairo-dock-menu.c:261
 msgid "Developers"
-msgstr ""
+msgstr "Розробники"
 
 #: ../src/cairo-dock-menu.c:262
 msgid "Main developer and project leader"
@@ -408,7 +408,7 @@
 
 #: ../src/cairo-dock-menu.c:280
 msgid "Website"
-msgstr ""
+msgstr "Сайт"
 
 #: ../src/cairo-dock-menu.c:281
 msgid "Beta-testing / Suggestions / Forum animation"
@@ -416,13 +416,16 @@
 
 #: ../src/cairo-dock-menu.c:282
 msgid "Translators for this language"
-msgstr ""
+msgstr "Перекладачі"
 
 #: ../src/cairo-dock-menu.c:283
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-" Maks Mokriev https://launchpad.net/~mcree"
+" Anton Sukhonosenko https://launchpad.net/~zoreslav\n"
+" Evhen https://launchpad.net/~d3dxdll\n"
+" Maks Mokriev https://launchpad.net/~mcree\n"
+" ma$terok https://launchpad.net/~m-shein"
 
 #: ../src/cairo-dock-menu.c:285
 msgid "Support"
@@ -436,7 +439,7 @@
 
 #: ../src/cairo-dock-menu.c:317
 msgid "How to help us?"
-msgstr ""
+msgstr "Як нам допомогти?"
 
 #: ../src/cairo-dock-menu.c:318
 msgid "Don't hesitate to join the project, we need you ;)"
@@ -444,7 +447,7 @@
 
 #: ../src/cairo-dock-menu.c:319
 msgid "Former contributors"
-msgstr ""
+msgstr "Попередні розробники"
 
 #: ../src/cairo-dock-menu.c:320
 msgid "For a complete list, please have a look to BZR logs"
@@ -460,7 +463,7 @@
 
 #: ../src/cairo-dock-menu.c:324
 msgid "Thanks"
-msgstr ""
+msgstr "Подяки"
 
 #: ../src/cairo-dock-menu.c:401
 msgid "Quit Cairo-Dock?"
@@ -630,11 +633,11 @@
 
 #: ../src/cairo-dock-menu.c:1018 ../src/cairo-dock-menu.c:1039
 msgid "Edit"
-msgstr ""
+msgstr "Редагувати"
 
 #: ../src/cairo-dock-menu.c:1020 ../src/cairo-dock-menu.c:1046
 msgid "Remove"
-msgstr ""
+msgstr "Видалити"
 
 #: ../src/cairo-dock-menu.c:1021
 msgid ""
@@ -657,7 +660,7 @@
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Detach"
-msgstr ""
+msgstr "Від’єднати"
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Return to the dock"
@@ -665,7 +668,7 @@
 
 #: ../src/cairo-dock-menu.c:1050
 msgid "Duplicate"
-msgstr ""
+msgstr "Дублювати"
 
 #: ../src/cairo-dock-menu.c:1065
 msgid "Applet's handbook"

cairo-dock-3.0.1.tar.gz/po/vi.po -> cairo-dock-3.0.2.tar.gz/po/vi.po Changed

cairo-dock-3.0.1.tar.gz/po/zh_CN.po -> cairo-dock-3.0.2.tar.gz/po/zh_CN.po Changed

@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n"
-"POT-Creation-Date: 2012-04-12 00:33+0000\n"
-"PO-Revision-Date: 2012-03-22 13:38+0000\n"
-"Last-Translator: Fabounet <fabounet03@gmail.com>\n"
+"POT-Creation-Date: 2012-04-14 15:42+0000\n"
+"PO-Revision-Date: 2012-06-10 09:22+0000\n"
+"Last-Translator: XiaoJSoft <whs_jwc@163.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-13 05:23+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-06-11 04:33+0000\n"
+"X-Generator: Launchpad (build 15376)\n"
 "Language: \n"
 
 #: ../src/cairo-dock-gui-commons.c:221
@@ -69,23 +69,23 @@
 
 #: ../src/cairo-dock-gui-commons.c:575
 msgid "Press the shortkey"
-msgstr ""
+msgstr "按下快捷键"
 
 #: ../src/cairo-dock-gui-commons.c:594
 msgid "Change the shortkey"
-msgstr ""
+msgstr "更改快捷键"
 
 #: ../src/cairo-dock-gui-commons.c:681
 msgid "Origin"
-msgstr ""
+msgstr "来源"
 
 #: ../src/cairo-dock-gui-commons.c:686
 msgid "Action"
-msgstr ""
+msgstr "动作"
 
 #: ../src/cairo-dock-gui-commons.c:690
 msgid "Shortkey"
-msgstr ""
+msgstr "快捷键"
 
 #: ../src/cairo-dock-gui-items.c:242
 msgid ""
@@ -98,7 +98,7 @@
 
 #: ../src/cairo-dock-gui-items.c:878
 msgid "Remove this item"
-msgstr ""
+msgstr "移除此项"
 
 #: ../src/cairo-dock-gui-main.c:129 ../data/messages:665
 msgid "Behaviour"
@@ -152,11 +152,11 @@
 
 #: ../src/cairo-dock-gui-main.c:1501
 msgid "Define all the keyboard shortcuts currently available."
-msgstr ""
+msgstr "定义所有当前可设置的键盘快捷键。"
 
 #: ../src/cairo-dock-gui-main.c:1502 ../data/messages:515 ../data/messages:767
 msgid "Shortkeys"
-msgstr ""
+msgstr "快捷键"
 
 #: ../src/cairo-dock-gui-main.c:1508
 msgid "All of the parameters you will never want to tweak."
@@ -383,19 +383,19 @@
 
 #: ../src/cairo-dock-menu.c:260
 msgid "Here is a list of the current developers and contributors"
-msgstr ""
+msgstr "当前开发者与贡献者名单"
 
 #: ../src/cairo-dock-menu.c:261
 msgid "Developers"
-msgstr ""
+msgstr "开发者"
 
 #: ../src/cairo-dock-menu.c:262
 msgid "Main developer and project leader"
-msgstr ""
+msgstr "主要开发者与项目领导人"
 
 #: ../src/cairo-dock-menu.c:263
 msgid "Contributors / Hackers"
-msgstr ""
+msgstr "贡献者/黑客"
 
 #: ../src/cairo-dock-menu.c:265
 msgid "Development"
@@ -403,23 +403,33 @@
 
 #: ../src/cairo-dock-menu.c:280
 msgid "Website"
-msgstr ""
+msgstr "网站"
 
 #: ../src/cairo-dock-menu.c:281
 msgid "Beta-testing / Suggestions / Forum animation"
-msgstr ""
+msgstr "Beta 测试/建议/论坛"
 
 #: ../src/cairo-dock-menu.c:282
 msgid "Translators for this language"
-msgstr ""
+msgstr "该语言翻译人员"
 
 #: ../src/cairo-dock-menu.c:283
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+" Cairo-Dock Team https://launchpad.net/~cairo-dock-team\n"
+" Eleanor Chen https://launchpad.net/~chenyueg\n"
 " Fabounet https://launchpad.net/~fabounet03\n"
 " GrayWaLL https://launchpad.net/~graywall\n"
+" Homer Xing https://launchpad.net/~homer-xing\n"
+" Matthieu Baerts https://launchpad.net/~matttbe\n"
+" Rossi Liu https://launchpad.net/~liueigi\n"
+" Saturn https://launchpad.net/~saturntoad\n"
+" Wang Dianjin https://launchpad.net/~tuhaihe\n"
+" Wylmer Wang https://launchpad.net/~wantinghard\n"
+" XiaoJSoft https://launchpad.net/~whs-jwc\n"
 " Yann SLADEK https://launchpad.net/~yann-sladek\n"
+" efree https://launchpad.net/~efree\n"
 " guofengzone https://launchpad.net/~guofengzone\n"
 " jarryson https://launchpad.net/~jarryson\n"
 " leng https://launchpad.net/~lengjingxu\n"
@@ -436,26 +446,28 @@
 "Thanks to all people that help us to improve the Cairo-Dock project.\n"
 "Thanks to all current, former and future contributors."
 msgstr ""
+"感谢所有帮助改进 Cairo-Dock 项目的人们。\n"
+"感谢所有现在、过去和未来的贡献者们。"
 
 #: ../src/cairo-dock-menu.c:317
 msgid "How to help us?"
-msgstr ""
+msgstr "如何帮助我们？"
 
 #: ../src/cairo-dock-menu.c:318
 msgid "Don't hesitate to join the project, we need you ;)"
-msgstr ""
+msgstr "加入项目别犹豫，我们需要您 :)"
 
 #: ../src/cairo-dock-menu.c:319
 msgid "Former contributors"
-msgstr ""
+msgstr "先前贡献者"
 
 #: ../src/cairo-dock-menu.c:320
 msgid "For a complete list, please have a look to BZR logs"
-msgstr ""
+msgstr "完整列表，请前往查看 BZR 记录"
 
 #: ../src/cairo-dock-menu.c:321
 msgid "Users of our forum"
-msgstr ""
+msgstr "论坛用户"
 
 #: ../src/cairo-dock-menu.c:322
 msgid "Artwork"
@@ -463,7 +475,7 @@
 
 #: ../src/cairo-dock-menu.c:324
 msgid "Thanks"
-msgstr ""
+msgstr "感谢"
 
 #: ../src/cairo-dock-menu.c:401
 msgid "Quit Cairo-Dock?"
@@ -583,7 +595,7 @@
 
 #: ../src/cairo-dock-menu.c:898
 msgid "Lock icons position"
-msgstr ""
+msgstr "锁定图标位置"
 
 #: ../src/cairo-dock-menu.c:902
 msgid "This will (un)lock the position of the icons."
@@ -629,14 +641,16 @@
 "It's not advised to quit the dock but you can press Shift to unlock this "
 "menu entry."
 msgstr ""
+"您正在使用 Cairo-Dock 会话！\n"
+"退出本程序并不是明智之举，但您可以按下 Shift 解锁该菜单项。"
 
 #: ../src/cairo-dock-menu.c:1018 ../src/cairo-dock-menu.c:1039
 msgid "Edit"
-msgstr ""
+msgstr "编辑"
 
 #: ../src/cairo-dock-menu.c:1020 ../src/cairo-dock-menu.c:1046
 msgid "Remove"
-msgstr ""
+msgstr "移除"
 
 #: ../src/cairo-dock-menu.c:1021
 msgid ""
@@ -658,7 +672,7 @@
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Detach"
-msgstr ""
+msgstr "分离"
 
 #: ../src/cairo-dock-menu.c:1043
 msgid "Return to the dock"
@@ -666,7 +680,7 @@
 
 #: ../src/cairo-dock-menu.c:1050
 msgid "Duplicate"
-msgstr ""
+msgstr "复制"
 
 #: ../src/cairo-dock-menu.c:1065
 msgid "Applet's handbook"
@@ -674,7 +688,7 @@
 
 #: ../src/cairo-dock-menu.c:1110
 msgid "Pick up an image"
-msgstr ""
+msgstr "选取一张图片"
 
 #: ../src/cairo-dock-menu.c:1341
 #, c-format
@@ -848,7 +862,7 @@
 
 #: ../src/cairo-dock.c:334
 msgid "Ask again on startup which backend to use."
-msgstr ""
+msgstr "再次询问启动时使用哪个后端。"
 
 #: ../src/cairo-dock.c:337
 msgid "Force the dock to consider this environnement - use it with care."
@@ -1013,7 +1027,7 @@
 #: ../src/gldit/cairo-dock-dock-manager.c:1656
 #: ../src/gldit/cairo-dock-dock-manager.c:1757
 msgid "Pop up the main dock"
-msgstr ""
+msgstr "弹出主 dock"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:243
 #, c-format
@@ -1050,11 +1064,11 @@
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a file"
-msgstr ""
+msgstr "选取文件"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:724
 msgid "Pick up a directory"
-msgstr ""
+msgstr "选取目录"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:984
 msgid "_Custom Icons_"
@@ -1133,6 +1147,8 @@
 "Could not access remote file %s. Maybe the server is down.\n"
 "Please retry later or contact us at glx-dock.org."
 msgstr ""
+"无法访问远程文件 %s。或许服务器当机。\n"
+"请重试或在 glx-dock.org 上联系我们。"
 
 #: ../src/gldit/cairo-dock-themes-manager.c:267
 #, c-format
@@ -1227,7 +1243,7 @@
 
 #: ../src/help/applet-tips-dialog.c:152
 msgid "Tips and Tricks"
-msgstr ""
+msgstr "提示与技巧"
 
 #: ../src/help/applet-tips-dialog.c:307
 msgid "Category"
@@ -1446,37 +1462,39 @@
 
 #: ../data/messages:51
 msgid "Minimizing / restauring a window"
-msgstr ""
+msgstr "最小化/恢复窗口"
 
 #: ../data/messages:53
 msgid ""
 "Clicking on its icon will bring the window on top.\n"
 "When the window has the focus, clicking on its icon will minimize the window."
 msgstr ""
+"点击它的图标将使窗口置顶。\n"
+"当窗口拥有焦点时，点击它的图标将最小化窗口。"
 
 #: ../data/messages:55
 msgid "Launching an application several times"
-msgstr ""
+msgstr "多次启动一个应用"
 
 #: ../data/messages:57
 msgid ""
 "You can launch an application several times by SHIFT+clicking on its icon "
 "(or from the menu)."
-msgstr ""
+msgstr "您可以通过 SHIFT+点击应用程序图标(或从菜单) 来多次启动一个应用。"
 
 #: ../data/messages:59
 msgid "Switching between the windows of a same application"
-msgstr ""
+msgstr "在相同应用窗口间切换"
 
 #: ../data/messages:61
 msgid ""
 "With your mouse, scroll up/down on one of the icons of the application. Each "
 "time you scroll, the next/previous window will be presented to you."
-msgstr ""
+msgstr "使用您的鼠标，向上/下滚动应用程序的图标。您每次滚动时，将显示下一个/上一个窗口。"
 
 #: ../data/messages:63
 msgid "Grouping windows of a given application"
-msgstr ""
+msgstr "给定应用程序的分组窗口"
 
 #: ../data/messages:65
 msgid ""
@@ -1485,24 +1503,26 @@
 "Clicking on the main icon will display all the windows of the application "
 "side-by-side (if your Window Manager is able to do that)."
 msgstr ""
+"当每个应用程序有多个窗口时，每个窗口的图标将出现在 dock 上；它们将在子 dock 中合成一组。\n"
+"点击主图标将并排显示应用程序的所有窗口(如果您的窗口管理器可以这样做)。"
 
 #: ../data/messages:67
 msgid "Setting a custom icon for an application"
-msgstr ""
+msgstr "设置应用程序的自定义图标"
 
 #: ../data/messages:69
 msgid "See \"Changing an icon's image\" in the \"Icons\" category."
-msgstr ""
+msgstr "在“图标”分类查看“更改图标图像”。"
 
 #: ../data/messages:71
 msgid "Showing windows preview over the icons"
-msgstr ""
+msgstr "鼠标移到图标上时显示窗口预览"
 
 #: ../data/messages:73
 msgid ""
 "You need to run Compiz, and enable the \"Window Preview\" plug-in in Compiz. "
 "Install \"ccsm\" to be able to configure Compiz."
-msgstr ""
+msgstr "您需要运行 Compiz，并启用 Compiz 中的“窗口预览”插件。安装“ccsm”可配置 Compiz。"
 
 #: ../data/messages:75 ../data/messages:185 ../data/messages:205
 #: ../data/messages:243 ../data/messages:285 ../data/messages:289
@@ -1516,11 +1536,11 @@
 
 #: ../data/messages:79
 msgid "Docks"
-msgstr ""
+msgstr "Dock"
 
 #: ../data/messages:81
 msgid "Positionning the dock on the screen"
-msgstr ""
+msgstr "在屏幕上定位 dock"
 
 #: ../data/messages:83
 msgid ""
@@ -1530,10 +1550,13 @@
 "In the case of a 2nd or 3rd dock, right-click -> Cairo-Dock -> set up this "
 "dock, and then select the position you want."
 msgstr ""
+"该 dock 可以被放置在屏幕的任何位置。\n"
+"考虑到主 dock，需 右击-> Cairo-Dock -> 配置，然后选择您希望的位置。\n"
+"考虑到第 2 个或第 3 个 dock，右击-> Cairo-Dock -> 设置本 dock，并选择您希望的位置。"
 
 #: ../data/messages:85
 msgid "Hiding the dock to use all the screen"
-msgstr ""
+msgstr "隐藏停靠栏以使用整个屏幕"
 
 #: ../data/messages:87
 msgid ""
@@ -1544,10 +1567,13 @@
 "In the case of a 2nd or 3rd dock, right-click -> Cairo-Dock -> set up this "
 "dock, and then select the visibility you want."
 msgstr ""
+"停靠栏可以隐藏自身为应用程序腾出屏幕空间，但是它也可以像面板一样一直保持可见。\n"
+"按如下的方式修改：右键 -> Cairo-Dock -> 配置，然后将你想要的选为可见（visibility）即可。\n"
+"对于第二个或者第三个停靠栏来说，可以点击右键 -> Cairo-Dock -> 设置此停靠栏，然后将你想要的选为可见即可。"
 
 #: ../data/messages:91
 msgid "Placing applets on your desktop"
-msgstr ""
+msgstr "防止插件到您的桌面"
 
 #: ../data/messages:93
 msgid ""
@@ -1586,7 +1612,7 @@
 
 #: ../data/messages:103
 msgid "Changing the desklets decorations"
-msgstr ""
+msgstr "正在更改桌面装饰"
 
 #: ../data/messages:105
 msgid ""
@@ -1597,7 +1623,7 @@
 
 #: ../data/messages:107
 msgid "Useful Features"
-msgstr ""
+msgstr "有用的功能"
 
 #: ../data/messages:109
 msgid "Having a calendar with tasks"
@@ -1629,7 +1655,7 @@
 
 #: ../data/messages:117
 msgid "Showing all the desktops"
-msgstr ""
+msgstr "显示所有桌面"
 
 #: ../data/messages:119
 msgid ""
@@ -1640,7 +1666,7 @@
 
 #: ../data/messages:121
 msgid "Changing the screen resolution"
-msgstr ""
+msgstr "更改屏幕分辨率"
 
 #: ../data/messages:123
 msgid ""
@@ -1650,7 +1676,7 @@
 
 #: ../data/messages:125
 msgid "Locking your session"
-msgstr ""
+msgstr "锁定您的会话"
 
 #: ../data/messages:127
 msgid ""
@@ -1674,7 +1700,7 @@
 
 #: ../data/messages:133
 msgid "Turning Composite OFF during games"
-msgstr ""
+msgstr "在游戏期间关闭组件"
 
 #: ../data/messages:135
 msgid ""
@@ -1686,7 +1712,7 @@
 
 #: ../data/messages:137
 msgid "Seeing the hourly weather forecast"
-msgstr ""
+msgstr "查看每小时的天气预报"
 
 #: ../data/messages:139
 msgid ""
@@ -1700,7 +1726,7 @@
 
 #: ../data/messages:141
 msgid "Adding a file or a web page into the dock"
-msgstr ""
+msgstr "添加文件或网页到 dock"
 
 #: ../data/messages:143
 msgid ""
@@ -1714,7 +1740,7 @@
 
 #: ../data/messages:145
 msgid "Importing a folder into the dock"
-msgstr ""
+msgstr "将文件夹导入到 dock"
 
 #: ../data/messages:147
 msgid ""
@@ -1725,7 +1751,7 @@
 
 #: ../data/messages:149
 msgid "Accessing the recent events"
-msgstr ""
+msgstr "访问最近事件"
 
 #: ../data/messages:151
 msgid ""
@@ -1739,7 +1765,7 @@
 
 #: ../data/messages:153
 msgid "Quickly opening a recent file with a launcher"
-msgstr ""
+msgstr "使用启动器快速打开一个最近文件"
 
 #: ../data/messages:155
 msgid ""
@@ -1752,7 +1778,7 @@
 
 #: ../data/messages:157
 msgid "Accessing disks"
-msgstr ""
+msgstr "访问磁盘"
 
 #: ../data/messages:159
 msgid ""
@@ -1764,7 +1790,7 @@
 
 #: ../data/messages:161
 msgid "Accessing folder bookmarks"
-msgstr ""
+msgstr "访问文件夹书签"
 
 #: ../data/messages:163
 msgid ""
@@ -1791,7 +1817,7 @@
 
 #: ../data/messages:169
 msgid "Adding / removing a desktop"
-msgstr ""
+msgstr "添加/移除一个桌面"
 
 #: ../data/messages:171
 msgid ""
@@ -1802,7 +1828,7 @@
 
 #: ../data/messages:173
 msgid "Controling the sound volume"
-msgstr ""
+msgstr "控制声音音量"
 
 #: ../data/messages:175
 msgid ""
@@ -1814,7 +1840,7 @@
 
 #: ../data/messages:177
 msgid "Controling the screen brightness"
-msgstr ""
+msgstr "控制屏幕亮度"
 
 #: ../data/messages:179
 msgid ""
@@ -1825,7 +1851,7 @@
 
 #: ../data/messages:181
 msgid "Removing completely the gnome-panel"
-msgstr ""
+msgstr "完全移除 gnome-panel"
 
 #: ../data/messages:183
 msgid ""
@@ -1840,7 +1866,7 @@
 msgid ""
 "If you are on Gnome, you can click on this button in order to automatically "
 "modify this key:"
-msgstr ""
+msgstr "如果您在 Gnome 下，您可以点击该按钮以自动更改该按键："
 
 #: ../data/messages:189
 msgid "Troubleshooting"
@@ -2009,11 +2035,11 @@
 
 #: ../data/messages:245
 msgid "If you're on Gnome you can click on this button:"
-msgstr ""
+msgstr "如果您在 Gnome 下，您可以点击该按钮："
 
 #: ../data/messages:247
 msgid "The Project"
-msgstr ""
+msgstr "项目"
 
 #: ../data/messages:249
 msgid "Join the project!"
@@ -2058,6 +2084,9 @@
 "\n"
 "The Cairo-Dock Team"
 msgstr ""
+"\n"
+"\n"
+"Cairo-Dock 团队"
 
 #: ../data/messages:263
 msgid "Websites"
@@ -2073,7 +2102,7 @@
 
 #: ../data/messages:273
 msgid "More applets available online!"
-msgstr ""
+msgstr "在线获取更多插件！"
 
 #: ../data/messages:275
 msgid "Cairo-Dock-Plug-ins-Extras"
@@ -2089,6 +2118,8 @@
 " One for stable releases and another which is updated weekly (unstable "
 "version)"
 msgstr ""
+"我们维护了 Debian、Ubuntu 和其它 Debian 系列发行版本 2 个仓库：\n"
+" 一个是稳定版本，另一个为每周更新仓库(非稳定版本)"
 
 #: ../data/messages:281
 msgid "Debian/Ubuntu"
@@ -2152,19 +2183,19 @@
 
 #: ../data/messages:313
 msgid "Image filename:"
-msgstr ""
+msgstr "图片文件名："
 
 #: ../data/messages:315
 msgid "Set to 0 to use the default applet size"
-msgstr ""
+msgstr "设为 0 使用默认小程序大小"
 
 #: ../data/messages:317
 msgid "Desired icon size for this applet"
-msgstr ""
+msgstr "希望的该小程序图标大小"
 
 #: ../data/messages:319
 msgid "Applet's Handbook"
-msgstr ""
+msgstr "小程序手册"
 
 #: ../data/messages:321
 msgid "Desklet"
@@ -2178,7 +2209,7 @@
 
 #: ../data/messages:327
 msgid "Lock position?"
-msgstr ""
+msgstr "锁定位置？"
 
 #: ../data/messages:329
 msgid ""
@@ -2188,7 +2219,7 @@
 
 #: ../data/messages:331
 msgid "Desklet dimensions (width x height):"
-msgstr ""
+msgstr "小工具维度(宽 x 高 )："
 
 #: ../data/messages:333
 msgid ""
@@ -2198,7 +2229,7 @@
 
 #: ../data/messages:335
 msgid "Desklet position (x, y):"
-msgstr ""
+msgstr "小工具位置(横坐标，纵坐标)："
 
 #: ../data/messages:337
 msgid ""
@@ -2208,11 +2239,11 @@
 
 #: ../data/messages:339
 msgid "Rotation:"
-msgstr ""
+msgstr "旋转："
 
 #: ../data/messages:343
 msgid "Is detached from the dock"
-msgstr ""
+msgstr "从 dock 分离？"
 
 #: ../data/messages:345
 msgid ""
@@ -2260,7 +2291,7 @@
 
 #: ../data/messages:371
 msgid "Background transparency:"
-msgstr ""
+msgstr "背景透明度："
 
 #: ../data/messages:373
 msgid "in pixels. Use this to adjust the left position of drawings."
@@ -2306,7 +2337,7 @@
 
 #: ../data/messages:393
 msgid "Foreground tansparency:"
-msgstr ""
+msgstr "前景透明度："
 
 #: ../data/messages:395 ../data/messages:1267
 msgid "Behavior"
@@ -2444,7 +2475,7 @@
 
 #: ../data/messages:471 ../data/messages:679
 msgid "Place new icons"
-msgstr ""
+msgstr "放置新图标"
 
 #: ../data/messages:473 ../data/messages:681
 msgid "At the beginning of the dock"
@@ -2460,7 +2491,7 @@
 
 #: ../data/messages:479 ../data/messages:687
 msgid "At the end of the dock"
-msgstr ""
+msgstr "在 dock 末尾"
 
 #: ../data/messages:481
 msgid "Icons' animations and effects"
@@ -2468,7 +2499,7 @@
 
 #: ../data/messages:483
 msgid "& On mouse hover:"
-msgstr ""
+msgstr "& 鼠标悬停："
 
 #: ../data/messages:487
 msgid ""
@@ -2518,7 +2549,7 @@
 
 #: ../data/messages:517 ../data/messages:769
 msgid "Keyboard shortcuts currently available"
-msgstr ""
+msgstr "当前可用的键盘快捷键"
 
 #: ../data/messages:519 ../data/messages:771
 msgid ""
@@ -2623,19 +2654,19 @@
 
 #: ../data/messages:613
 msgid "The higher, the faster the dock will appear"
-msgstr ""
+msgstr "dock 将显示地越高越快"
 
 #: ../data/messages:615
 msgid "Callback sensitivity:"
-msgstr ""
+msgstr "回调灵敏度："
 
 #: ../data/messages:617
 msgid "high"
-msgstr ""
+msgstr "高"
 
 #: ../data/messages:619
 msgid "low"
-msgstr ""
+msgstr "低"
 
 #: ../data/messages:621
 msgid "How to call the dock back:"
@@ -2831,7 +2862,7 @@
 
 #: ../data/messages:737
 msgid "Nothing"
-msgstr ""
+msgstr "无"
 
 #: ../data/messages:741
 msgid "Minimize"
@@ -3107,7 +3138,7 @@
 
 #: ../data/messages:907
 msgid "Background when hidden"
-msgstr ""
+msgstr "隐藏时背景"
 
 #: ../data/messages:909
 msgid "Several applets can be visible even when the dock is hidden"
@@ -3174,7 +3205,7 @@
 
 #: ../data/messages:951
 msgid "larger"
-msgstr ""
+msgstr "更大"
 
 #: ../data/messages:953
 msgid "Dialogs"

cairo-dock-3.0.1.tar.gz/po/zh_TW.po -> cairo-dock-3.0.2.tar.gz/po/zh_TW.po Changed

cairo-dock-3.0.1.tar.gz/src/cairo-dock-gui-main.c -> cairo-dock-3.0.2.tar.gz/src/cairo-dock-gui-main.c Changed

@@ -24,7 +24,11 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
+
+#include <gdk/gdkx.h>
+
 #include "config.h"
+#include "cairo-dock-notifications.h"
 #include "cairo-dock-module-factory.h"
 #include "cairo-dock-icon-facility.h"
 #include "cairo-dock-log.h"
@@ -123,7 +127,8 @@
 static GSList *s_path = NULL;
 static int s_iPreviewWidth, s_iNbButtonsByRow;
 static CairoDialog *s_pDialog = NULL;
-static int s_iSidShowGroupDialog = 0;
+static guint s_iSidShowGroupDialog = 0;
+static guint s_iSidCheckGroupButton = 0;
 
 static const gchar *s_cCategoriesDescription[2*(CAIRO_DOCK_NB_CATEGORY+1)] = {
 	N_("Behaviour"), "icon-behavior.svg",
@@ -803,6 +808,10 @@
 	_show_group_or_category (pPrevPlace);
 }
 
+static void _on_group_dialog_destroyed (gpointer data)
+{
+	s_pDialog = NULL;
+}
 static gboolean _show_group_dialog (CairoDockGroupDescription *pGroupDescription)
 {
 	gchar *cDescription = NULL;
@@ -869,9 +878,7 @@
 		gdk_pixbuf_unref (pPreviewPixbuf);
 	}
 	
-	if (s_pDialog != NULL)
-		if (! cairo_dock_dialog_unreference (s_pDialog))
-			cairo_dock_dialog_unreference (s_pDialog);
+	cairo_dock_dialog_unreference (s_pDialog);
 	Icon *pIcon = cairo_dock_get_current_active_icon ();
 	if (pIcon == NULL || pIcon->cParentDockName == NULL || cairo_dock_icon_is_being_removed (pIcon))
 		pIcon = cairo_dock_get_dialogless_icon ();
@@ -885,8 +892,9 @@
 	myDialogsParam.dialogTextDescription.bUseMarkup = TRUE;
 	s_pDialog = cairo_dock_build_dialog (&attr, pIcon, CAIRO_CONTAINER (pDock));
 	myDialogsParam.dialogTextDescription.bUseMarkup = FALSE;
-	
-	cairo_dock_dialog_reference (s_pDialog);
+	cairo_dock_register_notification_on_object (s_pDialog,
+		NOTIFICATION_DESTROY, (CairoDockNotificationFunc)_on_group_dialog_destroyed,
+		CAIRO_DOCK_RUN_AFTER, NULL);
 	
 	gtk_window_set_transient_for (GTK_WINDOW (s_pDialog->container.pWidget), GTK_WINDOW (s_pMainWindow));
 	g_free (cDescription);
@@ -894,33 +902,85 @@
 	s_iSidShowGroupDialog = 0;
 	return FALSE;
 }
-static void on_enter_group_button (GtkButton *button, CairoDockGroupDescription *pGroupDescription)
+
+static GtkButton *s_pCurrentButton = NULL;
+static gboolean on_enter_group_button (GtkButton *button, GdkEventCrossing *pEvent, CairoDockGroupDescription *pGroupDescription)
 {
-	//g_print ("%s (%s)\n", __func__, pGroupDescription->cDescription);
+	g_print ("%s (%s)\n", __func__, pGroupDescription->cGroupName);
 	if (g_pPrimaryContainer == NULL) // inutile en maintenance, le dialogue risque d'apparaitre sur la souris.
-		return ;
+		return FALSE;
 	
+	// if we were about to show a dialog, cancel it to reset the timer.
 	if (s_iSidShowGroupDialog != 0)
 		g_source_remove (s_iSidShowGroupDialog);
 	
+	if (s_iSidCheckGroupButton != 0)
+	{
+		g_source_remove (s_iSidCheckGroupButton);
+		s_iSidCheckGroupButton = 0;
+	}
+	
+	// avoid re-entering the same button (can happen if the input shape of the dialog is set a bit late by X, and the dialog spawns under the cursor, which will make us leave the button and re-enter when the input shape is ready).
+	if (s_pCurrentButton == button)
+		return FALSE;
+	s_pCurrentButton = button; // we don't actually use the content of the pointer, only the address value.
+	
+	// show the dialog with a delay.
 	s_iSidShowGroupDialog = g_timeout_add (330, (GSourceFunc)_show_group_dialog, (gpointer) pGroupDescription);
+	return FALSE;
 }
-static void on_leave_group_button (GtkButton *button, gpointer *data)
+static gboolean _check_group_button (gpointer data)
 {
-	//g_print ("%s ()\n", __func__);
+	Window Xid = GDK_WINDOW_XID (gtk_widget_get_window (s_pMainWindow));
+	if (Xid != cairo_dock_get_current_active_window ()) // we're not the active window any more, so the 'leave' event was probably due to an Alt+Tab -> the mouse is really out of the button.
+	{
+		gtk_widget_hide (s_pPreviewBox);
+		
+		cairo_dock_dialog_unreference (s_pDialog);
+		
+		s_pCurrentButton = NULL;
+	}
+	s_iSidCheckGroupButton = 0;
+	return FALSE;
+}
+static gboolean on_leave_group_button (GtkButton *button, GdkEventCrossing *pEvent, gpointer data)
+{
+	g_print ("%s (%d, %d)\n", __func__, pEvent->mode, pEvent->detail);
+	// if we were about to show the dialog, cancel.
 	if (s_iSidShowGroupDialog != 0)
 	{
 		g_source_remove (s_iSidShowGroupDialog);
 		s_iSidShowGroupDialog = 0;
 	}
-
-	int iPreviewWidgetWidth = s_iPreviewWidth;
-	GtkWidget *pPreviewImage = s_pPreviewImage;
+	
+	if (s_iSidCheckGroupButton != 0)
+	{
+		g_source_remove (s_iSidCheckGroupButton);
+		s_iSidCheckGroupButton = 0;
+	}
+	
+	// check that we are really outside of the button (this may be false if the dialog is appearing under the mouse and has not yet its input shape (X lag)).
+	if (pEvent->detail != GDK_NOTIFY_ANCESTOR) // a LeaveNotify event not within the same window (ie, either an Alt+Tab or the dialog that spawned under the cursor)
+	{
+		int x, y;
+		gtk_widget_get_pointer (GTK_WIDGET (button), &x, &y);
+		GtkAllocation allocation;
+		gtk_widget_get_allocation (GTK_WIDGET (button), &allocation);
+		if (x >= 0 && x < allocation.width && y >= 0 && y < allocation.height) // we are actually still inside the button, ignore the event, we'll get an 'enter' event as soon as the dialog's input shape is ready.
+		{
+			s_iSidCheckGroupButton = g_timeout_add (1000, _check_group_button, NULL); // check in a moment if we left the button because of the dialog or because of another window (alt+tab).
+			return FALSE;
+		}
+	}
+	
+	// hide the dialog and the preview box.
 	gtk_widget_hide (s_pPreviewBox);
 	
-	if (! cairo_dock_dialog_unreference (s_pDialog))
-		cairo_dock_dialog_unreference (s_pDialog);
-	s_pDialog = NULL;
+	cairo_dock_dialog_unreference (s_pDialog);
+	
+	s_pCurrentButton = NULL;
+	
+	return FALSE;
 }
 
 
@@ -986,6 +1046,12 @@
 		g_source_remove (s_iSidShowGroupDialog);
 		s_iSidShowGroupDialog = 0;
 	}
+	cairo_dock_dialog_unreference (s_pDialog);
+	if (s_iSidCheckGroupButton != 0)
+	{
+		g_source_remove (s_iSidCheckGroupButton);
+		s_iSidCheckGroupButton = 0;
+	}
 	return FALSE;
 }
 
@@ -1364,8 +1430,8 @@
 		g_signal_connect (G_OBJECT (pGroupButton), "clicked", G_CALLBACK(on_click_group_button), pGroupDescription);
 	else
 		gtk_widget_set_sensitive (pGroupButton, FALSE);
-	g_signal_connect (G_OBJECT (pGroupButton), "enter", G_CALLBACK(on_enter_group_button), pGroupDescription);
-	g_signal_connect (G_OBJECT (pGroupButton), "leave", G_CALLBACK(on_leave_group_button), NULL);
+	g_signal_connect (G_OBJECT (pGroupButton), "enter-notify-event", G_CALLBACK(on_enter_group_button), pGroupDescription);
+	g_signal_connect (G_OBJECT (pGroupButton), "leave-notify-event", G_CALLBACK(on_leave_group_button), NULL);
 
 	GtkWidget *pButtonHBox = _gtk_hbox_new (CAIRO_DOCK_FRAME_MARGIN);
 	GtkWidget *pImage = _make_image (cIconPath, CAIRO_DOCK_GROUP_ICON_SIZE);

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-callbacks.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-callbacks.c Changed

@@ -98,7 +98,7 @@
 			: (pDock->container.iMouseY < 0
 			||
 		pDock->container.iMouseY >= (pDock->fMagnitudeMax != 0 ? pDock->container.iHeight : pDock->iMinDockHeight))));*/
-	double x1, x2, y1, y2;
+	int x1, x2, y1, y2;
 	if (pDock->iInputState == CAIRO_DOCK_INPUT_ACTIVE)
 	{
 		x1 = 0;
@@ -106,14 +106,14 @@
 		if (pDock->container.bDirectionUp)
 		{
 			///y1 = (pDock->fMagnitudeMax != 0 ? 0 : pDock->container.iHeight - pDock->iMinDockHeight);
-			y1 = pDock->container.iHeight - pDock->iActiveHeight;
+			y1 = pDock->container.iHeight - pDock->iActiveHeight + 1;
 			y2 = pDock->container.iHeight;
 		}
 		else
 		{
 			y1 = 0;
 			///y2 = (pDock->fMagnitudeMax != 0 ? pDock->container.iHeight : pDock->iMinDockHeight);
-			y2 = pDock->iActiveHeight;
+			y2 = pDock->iActiveHeight - 1;
 		}
 	}
 	else if (pDock->iInputState == CAIRO_DOCK_INPUT_AT_REST)
@@ -122,13 +122,13 @@
 		x2 = (pDock->container.iWidth + pDock->iMinDockWidth) / 2;
 		if (pDock->container.bDirectionUp)
 		{
-			y1 = pDock->container.iHeight - pDock->iMinDockHeight;
+			y1 = pDock->container.iHeight - pDock->iMinDockHeight + 1;
 			y2 = pDock->container.iHeight;
 		}
 		else
 		{
 			y1 = 0;
-			y2 = pDock->iMinDockHeight;
+			y2 = pDock->iMinDockHeight - 1;
 		}		
 	}
 	else // hidden
@@ -907,6 +907,7 @@
 		return FALSE;
 	}*/
 	
+	gboolean bWasInside = pDock->container.bInside;
 	pDock->container.bInside = TRUE;
 	
 	// animation d'entree.
@@ -965,8 +966,11 @@
 		cairo_dock_start_showing (pDock); // on a mis a jour la zone d'input avant, sinon la fonction le ferait, ce qui serait inutile.
 	}
 	
+	// start growing up (do it before calculating icons, so that we don't seem to be in an anormal state, where we're inside a dock that doesn't grow).
+	cairo_dock_start_growing (pDock);
+	
 	// since we've just entered the dock, the pointed icon has changed from none to the current one.
-	if (pEvent != NULL)
+	if (pEvent != NULL && ! bWasInside)
 	{
 		// update the mouse coordinates
 		if (pDock->container.bIsHorizontal)
@@ -987,8 +991,6 @@
 			cairo_dock_on_change_icon (NULL, icon, pDock); // we were out of the dock, so there is no previous pointed icon.
 		}
 	}
-	// on lance le grossissement.
-	cairo_dock_start_growing (pDock);
 	
 	return TRUE;
 }

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-class-manager.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-class-manager.c Changed

@@ -1653,7 +1653,7 @@
 	
 	cd_debug ("%s (%s, '%s')", __func__, cCommand, cStartupWMClass);
 	gchar *cResult = NULL;
-	if (cStartupWMClass == NULL || *cStartupWMClass == '\0' || strcmp (cStartupWMClass, "Wine") == 0)  // on force pour wine, car meme si la classe est explicitement definie en tant que "Wine", cette information est inexploitable.
+	if (cStartupWMClass == NULL || *cStartupWMClass == '\0' || g_strcmp0 (cStartupWMClass, "Wine") == 0)  // on force pour wine, car meme si la classe est explicitement definie en tant que "Wine", cette information est inexploitable.
 	{
 		if (cCommand == NULL || *cCommand == '\0')
 			return NULL;
@@ -1661,7 +1661,7 @@
 		gchar *str;
 		const gchar *cClass = cDefaultClass;  // pointer to the current class.
 		
-		if (strncmp (cClass, "gksu", 4) == 0 || strncmp (cClass, "kdesu", 4) == 0 || strncmp (cClass, "su-to-root", 10) == 0)  // on prend la fin.
+		if (strncmp (cClass, "gksu", 4) == 0 || strncmp (cClass, "kdesu", 5) == 0 || strncmp (cClass, "su-to-root", 10) == 0)  // on prend la fin.
 		{
 			str = (gchar*)cClass + strlen(cClass) - 1;  // last char.
 			while (*str == ' ')  // par securite on enleve les espaces en fin de ligne.
@@ -1911,7 +1911,18 @@
 			{
 				gchar **pMenuItem = g_new0 (gchar*, 4);
 				pMenuItem[0] = g_key_file_get_locale_string (pKeyFile, cGroup, "Name", NULL, NULL);
-				pMenuItem[1] = g_key_file_get_string (pKeyFile, cGroup, "Exec", NULL);
+				cCommand = g_key_file_get_string (pKeyFile, cGroup, "Exec", NULL);
+				if (cCommand != NULL)  // remove the launching options %x.
+				{
+					gchar *str = strchr (cCommand, '%');  // search the first one.
+					if (str != NULL)
+					{
+						if (str != cCommand && (*(str-1) == '"' || *(str-1) == '\''))  // take care of "" around the option.
+							str --;
+						*str = '\0';  // il peut rester un espace en fin de chaine, ce n'est pas grave.
+					}
+				}
+				pMenuItem[1] = cCommand;
 				pMenuItem[2] = g_key_file_get_string (pKeyFile, cGroup, "Icon", NULL);
 				
 				pClassAppli->pMenuItems = g_list_append (pClassAppli->pMenuItems, pMenuItem);

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-dialog-manager.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-dialog-manager.c Changed

@@ -221,8 +221,17 @@
 	CairoDialog *pDialog)
 {
 	//g_print ("press button on dialog\n");
-	if (pButton->time > pDialog->iButtonPressTime) // it's not a click on the interactive widget that has been passed to the dialog.
+	if (pButton->button == 1 && pButton->time > pDialog->iButtonPressTime) // left-click, and not a click on the interactive widget that has been passed to the dialog.
 	{
+		// the interactive widget may have holes (for instance, a gtk-calendar); ignore them, otherwise it's really easy to close the dialog unexpectedly.
+		if (pDialog->pInteractiveWidget)
+		{
+			GtkAllocation allocation;
+			gtk_widget_get_allocation (pDialog->pInteractiveWidget, &allocation);
+			if (pButton->x >= allocation.x && pButton->x <= allocation.x + allocation.width
+			&& pButton->y >= allocation.y && pButton->y <= allocation.y + allocation.height) // the click is inside the widget.
+				return FALSE;
+		}
 		if (pButton->type == GDK_BUTTON_PRESS)
 		{
 			if (pDialog->pButtons == NULL) // not a dialog that can be closed by a button => we close it here

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-dock-facility.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-dock-facility.c Changed

@@ -249,7 +249,7 @@
 				}
 				//pDock->container.bInside = TRUE;
 				///if ((pDock->bAtBottom && pDock->iRefCount == 0 && ! pDock->bAutoHide) || (pDock->container.iWidth != pDock->iMaxDockWidth || pDock->container.iHeight != pDock->iMaxDockHeight) || (!pDock->container.bInside))  // on le fait pas avec l'auto-hide, car un signal d'entree est deja emis a cause des mouvements/redimensionnements de la fenetre, et en rajouter un ici fout le boxon.  // !pDock->container.bInside ajoute pour le bug du chgt de bureau.
-				if ((pDock->iMagnitudeIndex == 0 && pDock->iRefCount == 0 && ! pDock->bAutoHide) || !pDock->container.bInside)
+				if ((pDock->iMagnitudeIndex == 0 && pDock->iRefCount == 0 && ! pDock->bAutoHide && ! pDock->bIsGrowingUp) || !pDock->container.bInside)  // we are probably a little bit paranoia here, especially with the first case ... anyway, if we missed the 'enter' event for some reason, force it here.
 				{
 					//g_print ("  on emule une re-rentree (pDock->iMagnitudeIndex:%d)\n", pDock->iMagnitudeIndex);
 					cairo_dock_emit_enter_signal (CAIRO_CONTAINER (pDock));

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-draw-opengl.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-draw-opengl.c Changed

@@ -571,29 +571,32 @@
 			
 			if (icon->bHasHiddenBg)
 			{
-				glPushMatrix ();
 				if (icon->pHiddenBgColor)  // custom bg color
 					memcpy (pHiddenBgColor, icon->pHiddenBgColor, 4*sizeof (gdouble));
 				else  // default bg color
 					memcpy (pHiddenBgColor, myDocksParam.fHiddenBg, 4*sizeof (gdouble));
 				pHiddenBgColor[3] *= pDock->fPostHideOffset;
-				w = icon->fWidth * icon->fScale;
-				h = icon->fHeight * icon->fScale;
-				if (pDock->container.bIsHorizontal)
+				if (pHiddenBgColor[3] != 0)
 				{
-					glTranslatef (icon->fDrawX + w/2,
-						pDock->container.iHeight - icon->fDrawY - h/2,
-						0.);
-					cairo_dock_draw_rounded_rectangle_opengl (w - 2*r + dw, h, r, 0, pHiddenBgColor);
+					glPushMatrix ();
+					w = icon->fWidth * icon->fScale;
+					h = icon->fHeight * icon->fScale;
+					if (pDock->container.bIsHorizontal)
+					{
+						glTranslatef (icon->fDrawX + w/2,
+							pDock->container.iHeight - icon->fDrawY - h/2,
+							0.);
+						cairo_dock_draw_rounded_rectangle_opengl (w - 2*r + dw, h, r, 0, pHiddenBgColor);
+					}
+					else
+					{
+						glTranslatef (icon->fDrawY + h/2,
+							pDock->container.iWidth - icon->fDrawX - w/2,
+							0.);
+						cairo_dock_draw_rounded_rectangle_opengl (h - 2*r + dw, w, r, 0, pHiddenBgColor);
+					}
+					glPopMatrix ();
 				}
-				else
-				{
-					glTranslatef (icon->fDrawY + h/2,
-						pDock->container.iWidth - icon->fDrawX - w/2,
-						0.);
-					cairo_dock_draw_rounded_rectangle_opengl (h - 2*r + dw, w, r, 0, pHiddenBgColor);
-				}
-				glPopMatrix ();
 			}
 			
 			glPushMatrix ();

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-draw.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-draw.c Changed

@@ -935,22 +935,25 @@
 					pHiddenBgColor = icon->pHiddenBgColor;
 				else  // default bg color
 					pHiddenBgColor = myDocksParam.fHiddenBg;
-				cairo_save (pCairoContext);
-				cairo_set_source_rgba (pCairoContext, pHiddenBgColor[0], pHiddenBgColor[1], pHiddenBgColor[2], pHiddenBgColor[3] * pDock->fPostHideOffset);
-				w = icon->fWidth * icon->fScale;
-				h = icon->fHeight * icon->fScale;
-				if (pDock->container.bIsHorizontal)
+				if ( pHiddenBgColor[3] != 0)
 				{
-					cairo_translate (pCairoContext, icon->fDrawX - dw / 2, icon->fDrawY);
-					cairo_dock_draw_rounded_rectangle (pCairoContext, r, 0, w - 2*r + dw, h);
+					cairo_save (pCairoContext);
+					cairo_set_source_rgba (pCairoContext, pHiddenBgColor[0], pHiddenBgColor[1], pHiddenBgColor[2], pHiddenBgColor[3] * pDock->fPostHideOffset);
+					w = icon->fWidth * icon->fScale;
+					h = icon->fHeight * icon->fScale;
+					if (pDock->container.bIsHorizontal)
+					{
+						cairo_translate (pCairoContext, icon->fDrawX - dw / 2, icon->fDrawY);
+						cairo_dock_draw_rounded_rectangle (pCairoContext, r, 0, w - 2*r + dw, h);
+					}
+					else
+					{
+						cairo_translate (pCairoContext, icon->fDrawY - dw / 2, icon->fDrawX);
+						cairo_dock_draw_rounded_rectangle (pCairoContext, r, 0, h - 2*r + dw, w);
+					}
+					cairo_fill (pCairoContext);
+					cairo_restore (pCairoContext);
 				}
-				else
-				{
-					cairo_translate (pCairoContext, icon->fDrawY - dw / 2, icon->fDrawX);
-					cairo_dock_draw_rounded_rectangle (pCairoContext, r, 0, h - 2*r + dw, w);
-				}
-				cairo_fill (pCairoContext);
-				cairo_restore (pCairoContext);
 			}
 			
 			cairo_save (pCairoContext);

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-icon-facility.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-icon-facility.c Changed

@@ -570,7 +570,7 @@
 	va_end (args);
 }
 
-void cairo_dock_set_quick_info (Icon *pIcon, CairoContainer *pContainer, const gchar *cQuickInfo)
+void cairo_dock_set_quick_info (Icon *pIcon, CairoContainer *pContainer_useless, const gchar *cQuickInfo)
 {
 	g_return_if_fail (pIcon != NULL);
 	
@@ -584,12 +584,12 @@
 		&myIconsParam.quickInfoTextDescription);
 }
 
-void cairo_dock_set_quick_info_printf (Icon *pIcon, CairoContainer *pContainer, const gchar *cQuickInfoFormat, ...)
+void cairo_dock_set_quick_info_printf (Icon *pIcon, CairoContainer *pContainer_useless, const gchar *cQuickInfoFormat, ...)
 {
 	va_list args;
 	va_start (args, cQuickInfoFormat);
 	gchar *cFullText = g_strdup_vprintf (cQuickInfoFormat, args);
-	cairo_dock_set_quick_info (pIcon, pContainer, cFullText);
+	cairo_dock_set_quick_info (pIcon, pContainer_useless, cFullText);
 	g_free (cFullText);
 	va_end (args);
 }
@@ -736,4 +736,4 @@
 		cairo_surface_destroy (surface);
 	}
 	return pixbuf;
-}
\ No newline at end of file
+}

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-icon-manager.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-icon-manager.c Changed

@@ -264,6 +264,12 @@
 {
 	g_return_val_if_fail (cFileName != NULL, NULL);
 	
+	#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 32)
+	static GStaticMutex s_aMutexLookupIcon = G_STATIC_MUTEX_INIT;
+	#else
+	static GMutex s_aMutexLookupIcon;
+	#endif
+	
 	//\_______________________ easy cases: we receive a path.
 	if (*cFileName == '~')
 	{
@@ -321,10 +327,20 @@
 			if (str != NULL)
 				*str = '\0';
 		}
+		#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 32)
+		g_static_mutex_lock (&s_aMutexLookupIcon);
+		#else
+		g_mutex_lock (&s_aMutexLookupIcon); // it seems gtk_icon_theme_lookup_icon is not thread-safe...
+		#endif
 		pIconInfo = gtk_icon_theme_lookup_icon (s_pIconTheme,
 			sIconPath->str,
 			iDesiredIconSize, // GTK_ICON_LOOKUP_FORCE_SIZE if size < 30 ?? -> icons can be different // a lot of themes now use only svg files.
 			GTK_ICON_LOOKUP_FORCE_SVG);
+		#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 32)
+		g_static_mutex_unlock (&s_aMutexLookupIcon);
+		#else
+		g_mutex_unlock (&s_aMutexLookupIcon);
+		#endif
 		if (pIconInfo != NULL)
 		{
 			g_string_assign (sIconPath, gtk_icon_info_get_filename (pIconInfo));
@@ -383,6 +399,8 @@
 
 void cairo_dock_remove_path_from_icon_theme (const gchar *cThemePath)
 {
+	if (! GTK_IS_ICON_THEME (s_pIconTheme))
+		return;
 	g_signal_handlers_block_matched (s_pIconTheme,
 		(GSignalMatchType) G_SIGNAL_MATCH_FUNC,
 		0, 0, NULL, _on_icon_theme_changed, NULL);
@@ -951,6 +969,7 @@
 		NOTIFICATION_RENDER_ICON,
 		(CairoDockNotificationFunc) cairo_dock_render_icon_notification,
 		CAIRO_DOCK_RUN_FIRST, NULL);
+	
 }

cairo-dock-3.0.1.tar.gz/src/gldit/cairo-dock-module-factory.c -> cairo-dock-3.0.2.tar.gz/src/gldit/cairo-dock-module-factory.c Changed

cairo-dock-3.0.1.tar.gz/src/gldit/eggaccelerators.c -> cairo-dock-3.0.2.tar.gz/src/gldit/eggaccelerators.c Changed

cairo-dock-3.0.1.tar.gz/src/icon-factory/cairo-dock-application-factory.c -> cairo-dock-3.0.2.tar.gz/src/icon-factory/cairo-dock-application-factory.c Changed

@@ -47,6 +47,7 @@
 static Atom s_aNetWmWindowType;
 static Atom s_aNetWmWindowTypeNormal;
 static Atom s_aNetWmWindowTypeDialog;
+static Atom s_aNetWmWindowTypeDock;
 static Atom s_aWmHints;
 static Atom s_aNetWmHidden;
 static Atom s_aNetWmFullScreen;
@@ -69,6 +70,7 @@
 	s_aNetWmWindowType = XInternAtom (s_XDisplay, "_NET_WM_WINDOW_TYPE", False);
 	s_aNetWmWindowTypeNormal = XInternAtom (s_XDisplay, "_NET_WM_WINDOW_TYPE_NORMAL", False);
 	s_aNetWmWindowTypeDialog = XInternAtom (s_XDisplay, "_NET_WM_WINDOW_TYPE_DIALOG", False);
+	s_aNetWmWindowTypeDock = XInternAtom (s_XDisplay, "_NET_WM_WINDOW_TYPE_DOCK", False);
 	
 	s_aWmHints = XInternAtom (s_XDisplay, "WM_HINTS", False);
 	
@@ -197,6 +199,10 @@
 					break;
 				}
 			}  // skip any other type (dock, menu, etc)
+			else if (pTypeBuffer[i] == s_aNetWmWindowTypeDock)  // workaround for the Unity-panel: if the type 'dock' is present, don't look further (as they add the 'normal' type too, which is non-sense).
+			{
+				break;
+			}
 		}
 		XFree (pTypeBuffer);
 		if (! bKeep)

Overview

Request 278 (accepted)

Request History