<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114868] trunk/dports/gnome/gnome-panel</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114868">114868</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-12-18 08:07:20 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-panel: misc updates and fixes
* apply upstream patches
* remove yet to be ported gnome-screensaver from gnome-flashback.sesson
* fix python variants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomepanelPortfile">trunk/dports/gnome/gnome-panel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomepanelfilespatchsessiondisablegnomescreensaverdiff">trunk/dports/gnome/gnome-panel/files/patch-session-disable-gnome-screensaver.diff</a></li>
<li><a href="#trunkdportsgnomegnomepanelfilespatchthrud1b93b820131216diff">trunk/dports/gnome/gnome-panel/files/patch-thru-d1b93b8-20131216.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnomepanelfilespatchappletsclockclocklocationcdiff">trunk/dports/gnome/gnome-panel/files/patch-applets-clock-clock-location.c.diff</a></li>
<li><a href="#trunkdportsgnomegnomepanelfilespatchconfigurediff">trunk/dports/gnome/gnome-panel/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnomepanelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-panel/Portfile (114867 => 114868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-panel/Portfile 2013-12-18 09:59:39 UTC (rev 114867)
+++ trunk/dports/gnome/gnome-panel/Portfile 2013-12-18 16:07:20 UTC (rev 114868)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gnome-panel
</span><span class="cx"> version 3.8.0
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories gnome
</span><span class="lines">@@ -49,9 +49,12 @@
</span><span class="cx"> depends_run port:gnome-settings-daemon \
</span><span class="cx"> port:yelp
</span><span class="cx">
</span><del>-patchfiles patch-configure.diff \
- patch-applets-clock-clock-location.c.diff
</del><ins>+patchfiles patch-thru-d1b93b8-20131216.diff \
+ patch-session-disable-gnome-screensaver.diff
</ins><span class="cx">
</span><ins>+use_autoreconf yes
+autoreconf.args -fvi
+
</ins><span class="cx"> configure.cflags-append \
</span><span class="cx"> -Wno-format-nonliteral
</span><span class="cx">
</span><span class="lines">@@ -68,14 +71,14 @@
</span><span class="cx">
</span><span class="cx"> build.args-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span class="cx">
</span><del>-variant python26 conflicts python25 python27 description {Build using Python 2.6} {
</del><ins>+variant python26 conflicts python27 description {Build using Python 2.6} {
</ins><span class="cx"> configure.python ${prefix}/bin/python2.6
</span><del>- depends_build-append port:python26
</del><ins>+ depends_build-append port:py26-gnome
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant python27 conflicts python25 python26 description {Build using Python 2.7} {
</del><ins>+variant python27 conflicts python26 description {Build using Python 2.7} {
</ins><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><del>- depends_build-append port:python27
</del><ins>+ depends_build-append port:py27-gnome
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset python26]} {
</span></span></pre></div>
<a id="trunkdportsgnomegnomepanelfilespatchappletsclockclocklocationcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gnome-panel/files/patch-applets-clock-clock-location.c.diff (114867 => 114868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-panel/files/patch-applets-clock-clock-location.c.diff 2013-12-18 09:59:39 UTC (rev 114867)
+++ trunk/dports/gnome/gnome-panel/files/patch-applets-clock-clock-location.c.diff 2013-12-18 16:07:20 UTC (rev 114868)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- applets/clock/clock-location.c.orig 2013-11-16 00:58:04.000000000 -0800
-+++ applets/clock/clock-location.c 2013-11-16 01:08:25.000000000 -0800
-@@ -542,9 +542,7 @@
- }
-
- priv->weather_info =
-- gweather_info_new_for_world (priv->world,
-- priv->loc,
-- GWEATHER_FORECAST_LIST);
-+ gweather_info_new (priv->loc, GWEATHER_FORECAST_LIST);
- g_signal_connect (priv->weather_info, "updated",
- G_CALLBACK (weather_info_updated), loc);
-
</del></span></pre></div>
<a id="trunkdportsgnomegnomepanelfilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gnome-panel/files/patch-configure.diff (114867 => 114868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-panel/files/patch-configure.diff 2013-12-18 09:59:39 UTC (rev 114867)
+++ trunk/dports/gnome/gnome-panel/files/patch-configure.diff 2013-12-18 16:07:20 UTC (rev 114868)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>---- configure.orig 2013-09-25 09:14:35.000000000 -0700
-+++ configure 2013-09-26 10:15:03.000000000 -0700
-@@ -13100,9 +13100,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
-
-
-
</del></span></pre></div>
<a id="trunkdportsgnomegnomepanelfilespatchsessiondisablegnomescreensaverdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnome-panel/files/patch-session-disable-gnome-screensaver.diff (0 => 114868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-panel/files/patch-session-disable-gnome-screensaver.diff (rev 0)
+++ trunk/dports/gnome/gnome-panel/files/patch-session-disable-gnome-screensaver.diff 2013-12-18 16:07:20 UTC (rev 114868)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+--- data/gnome-flashback.session.desktop.in.orig 2013-12-17 16:19:26.000000000 -0800
++++ data/gnome-flashback.session.desktop.in 2013-12-17 16:19:27.000000000 -0800
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+ _Name=GNOME Flashback (Metacity)
+-RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;
++RequiredComponents=gnome-panel;gnome-settings-daemon;metacity;
</ins></span></pre></div>
<a id="trunkdportsgnomegnomepanelfilespatchthrud1b93b820131216diff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnome-panel/files/patch-thru-d1b93b8-20131216.diff (0 => 114868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-panel/files/patch-thru-d1b93b8-20131216.diff (rev 0)
+++ trunk/dports/gnome/gnome-panel/files/patch-thru-d1b93b8-20131216.diff 2013-12-18 16:07:20 UTC (rev 114868)
</span><span class="lines">@@ -0,0 +1,5795 @@
</span><ins>+diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
+index 708e921..845d29b 100644
+--- applets/clock/calendar-window.c
++++ applets/clock/calendar-window.c
+@@ -1531,10 +1531,8 @@ create_hig_frame (CalendarWindow *calwin,
+ G_BINDING_DEFAULT|G_BINDING_INVERT_BOOLEAN|G_BINDING_SYNC_CREATE);
+ }
+
+-#ifdef HAVE_LIBECAL
+ g_settings_bind (calwin->priv->settings, key, expander, "expanded",
+ G_SETTINGS_BIND_DEFAULT);
+-#endif
+
+ return vbox;
+ }
+diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c
+index c4748ba..9e263b4 100644
+--- applets/clock/clock-location.c
++++ applets/clock/clock-location.c
+@@ -541,10 +541,12 @@ setup_weather_updates (ClockLocation *loc)
+ priv->weather_timeout = 0;
+ }
+
+- priv->weather_info =
+- gweather_info_new_for_world (priv->world,
+- priv->loc,
+- GWEATHER_FORECAST_LIST);
++#ifdef HAVE_GWEATHER_3_9_2_OR_NEWER
++ priv->weather_info = gweather_info_new (priv->loc, GWEATHER_FORECAST_LIST);
++#else
++ priv->weather_info = gweather_info_new_for_world (priv->world, priv->loc, GWEATHER_FORECAST_LIST);
++#endif
++
+ g_signal_connect (priv->weather_info, "updated",
+ G_CALLBACK (weather_info_updated), loc);
+
+diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c
+index 8799194..1ea7f9a 100644
+--- applets/clock/clock-utils.c
++++ applets/clock/clock-utils.c
+@@ -35,7 +35,6 @@
+ #include <gtk/gtk.h>
+
+ #include <librsvg/rsvg.h>
+-#include <librsvg/rsvg-cairo.h>
+
+ #include "clock.h"
+
+diff --git a/applets/clock/clock.c b/applets/clock/clock.c
+index 6b62daa..4f61bb4 100644
+--- applets/clock/clock.c
++++ applets/clock/clock.c
+@@ -131,14 +131,10 @@ struct _ClockData {
+ time_t current_time;
+ GnomeWallClock *wall_clock;
+ PanelAppletOrient orient;
+- int size;
+ GtkAllocation old_allocation;
+
+ SystemTimezone *systz;
+
+- int fixed_width;
+- int fixed_height;
+-
+ GtkWidget *showseconds_check;
+ GtkWidget *showdate_check;
+ GtkWidget *custom_hbox;
+@@ -199,14 +195,6 @@ _clock_get_widget (ClockData *cd,
+ return GTK_WIDGET (gtk_builder_get_object (cd->builder, name));
+ }
+
+-static void
+-unfix_size (ClockData *cd)
+-{
+- cd->fixed_width = -1;
+- cd->fixed_height = -1;
+- gtk_widget_queue_resize (cd->panel_button);
+-}
+-
+ static int
+ calculate_minimum_width (GtkWidget *widget,
+ const gchar *text)
+@@ -820,23 +808,6 @@ do_not_eat_button_press (GtkWidget *widget,
+ return FALSE;
+ }
+
+-/* Don't request smaller size then the last one we did, this avoids
+- jumping when proportional fonts are used. We must take care to
+- call "unfix_size" whenever options are changed or such where
+- we'd want to forget the fixed size */
+-static void
+-clock_size_request (GtkWidget *clock, GtkRequisition *req, gpointer data)
+-{
+- ClockData *cd = data;
+-
+- if (req->width > cd->fixed_width)
+- cd->fixed_width = req->width;
+- if (req->height > cd->fixed_height)
+- cd->fixed_height = req->height;
+- req->width = cd->fixed_width;
+- req->height = cd->fixed_height;
+-}
+-
+ static void
+ clock_update_text_gravity (GtkWidget *label)
+ {
+@@ -892,12 +863,6 @@ create_main_clock_label (ClockData *cd)
+ GtkWidget *label;
+
+ label = gtk_label_new (NULL);
+- g_signal_connect (label, "size_request",
+- G_CALLBACK (clock_size_request),
+- cd);
+- g_signal_connect_swapped (label, "style_set",
+- G_CALLBACK (unfix_size),
+- cd);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+ clock_update_text_gravity (label);
+ g_signal_connect (label, "screen-changed",
+@@ -995,7 +960,6 @@ create_clock_widget (ClockData *cd)
+
+ cd->props = NULL;
+ cd->orient = -1;
+- cd->size = panel_applet_get_size (PANEL_APPLET (cd->applet));
+
+ update_panel_weather (cd);
+
+@@ -1030,7 +994,6 @@ update_orient (ClockData *cd)
+
+ angle = gtk_label_get_angle (GTK_LABEL (cd->clockw));
+ if (angle != new_angle) {
+- unfix_size (cd);
+ gtk_label_set_angle (GTK_LABEL (cd->clockw), new_angle);
+ gtk_label_set_angle (GTK_LABEL (cd->panel_temperature_label), new_angle);
+ }
+@@ -1070,7 +1033,6 @@ applet_change_orient (PanelApplet *applet,
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (cd->main_obox), o);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (cd->weather_obox), o);
+
+- unfix_size (cd);
+ update_clock (NULL, NULL, cd);
+ update_calendar_popup (cd);
+ }
+@@ -1081,24 +1043,12 @@ panel_button_change_pixel_size (GtkWidget *widget,
+ GtkAllocation *allocation,
+ ClockData *cd)
+ {
+- int new_size;
+-
+ if (cd->old_allocation.width == allocation->width &&
+ cd->old_allocation.height == allocation->height)
+ return;
+
+- cd->old_allocation.width = allocation->width;
+- cd->old_allocation.height = allocation->height;
++ cd->old_allocation = *allocation;
+
+- if (cd->orient == PANEL_APPLET_ORIENT_LEFT ||
+- cd->orient == PANEL_APPLET_ORIENT_RIGHT)
+- new_size = allocation->width;
+- else
+- new_size = allocation->height;
+-
+- cd->size = new_size;
+-
+- unfix_size (cd);
+ update_clock (NULL, NULL, cd);
+ }
+
+@@ -1375,9 +1325,6 @@ fill_clock_applet (PanelApplet *applet)
+ g_signal_connect (cd->applet_settings, "changed::cities",
+ G_CALLBACK (locations_changed), cd);
+
+- cd->fixed_width = -1;
+- cd->fixed_height = -1;
+-
+ cd->applet = GTK_WIDGET (applet);
+
+ cd->world = gweather_location_new_world (FALSE);
+@@ -1669,7 +1616,7 @@ edit_clear (ClockData *cd)
+ GtkWidget *lon_combo = _clock_get_widget (cd, "edit-location-longitude-combo");
+
+ /* clear out the old data */
+- gweather_location_entry_set_location (cd->location_entry, NULL);
++ //gweather_location_entry_set_location (cd->location_entry, NULL);
+ gweather_timezone_menu_set_tzid (cd->zone_combo, NULL);
+
+ gtk_entry_set_text (GTK_ENTRY (lat_entry), "");
+diff --git a/applets/clock/clock.h b/applets/clock/clock.h
+index 4cd0a12..1084b51 100644
+--- applets/clock/clock.h
++++ applets/clock/clock.h
+@@ -31,7 +31,6 @@ G_BEGIN_DECLS
+
+ #define CLOCK_ICON "gnome-panel-clock"
+ #define CLOCK_RESOURCE_PATH "/org/gnome/panel/applet/clock/"
+-#define CLOCK_SCHEMA_DIR "/schemas/apps/clock_applet/prefs"
+
+ G_END_DECLS
+
+diff --git a/applets/clock/test-system-timezone.c b/applets/clock/test-system-timezone.c
+index 64a816d..6cca1e4 100644
+--- applets/clock/test-system-timezone.c
++++ applets/clock/test-system-timezone.c
+@@ -74,8 +74,6 @@ main (int argc,
+
+ retval = 0;
+
+- g_type_init ();
+-
+ context = g_option_context_new ("");
+ g_option_context_add_main_entries (context, options, NULL);
+
+diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
+index 5dad715..ab74dd2 100644
+--- applets/notification_area/main.c
++++ applets/notification_area/main.c
+@@ -24,7 +24,6 @@
+ #include <string.h>
+
+ #include <panel-applet.h>
+-#include <panel-applet-gconf.h>
+
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c
+index d77d068..f44fc4e 100644
+--- applets/notification_area/na-tray.c
++++ applets/notification_area/na-tray.c
+@@ -23,7 +23,6 @@
+ #include <string.h>
+
+ #include <panel-applet.h>
+-#include <panel-applet-gconf.h>
+
+ #include <gtk/gtk.h>
+
+diff --git a/applets/notification_area/testtray.c b/applets/notification_area/testtray.c
+index 7efa0d7..de76e18 100644
+--- applets/notification_area/testtray.c
++++ applets/notification_area/testtray.c
+@@ -150,14 +150,14 @@ create_tray_on_screen (GdkScreen *screen,
+ data->window = window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ g_object_weak_ref (G_OBJECT (window), (GWeakNotify) maybe_quit, NULL);
+
+- vbox = gtk_vbox_new (FALSE, 6);
++ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
+ gtk_container_add (GTK_CONTAINER (window), vbox);
+
+ button = gtk_button_new_with_mnemonic ("_Add another tray");
+ g_signal_connect (button, "clicked", G_CALLBACK (add_tray_cb), data);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+- hbox = gtk_hbox_new (FALSE, 12);
++ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ label = gtk_label_new_with_mnemonic ("_Orientation:");
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
+index ff74dbc..f2fbe0b 100644
+--- applets/wncklet/window-list.c
++++ applets/wncklet/window-list.c
+@@ -267,7 +267,7 @@ move_unminimized_windows_changed (GSettings *settings,
+ }
+
+ static void
+-setup_gconf (TasklistData *tasklist)
++setup_gsettings (TasklistData *tasklist)
+ {
+ tasklist->settings =
+ panel_applet_settings_new (PANEL_APPLET (tasklist->applet),
+@@ -364,9 +364,7 @@ window_list_applet_fill (PanelApplet *applet)
+ PANEL_APPLET_EXPAND_MINOR |
+ PANEL_APPLET_HAS_HANDLE);
+
+- panel_applet_add_preferences (applet, "/schemas/apps/window_list_applet/prefs", NULL);
+-
+- setup_gconf (tasklist);
++ setup_gsettings (tasklist);
+
+ tasklist->include_all_workspaces = g_settings_get_boolean (tasklist->settings, "display-all-workspaces");
+ tasklist->grouping = g_settings_get_enum (tasklist->settings, "group-windows");
+diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
+index 9139a41..8b86fa4 100644
+--- applets/wncklet/workspace-switcher.c
++++ applets/wncklet/workspace-switcher.c
+@@ -287,7 +287,7 @@ all_workspaces_changed (GSettings *settings,
+ }
+
+ static void
+-setup_gconf (PagerData *pager)
++setup_gsettings (PagerData *pager)
+ {
+ pager->settings =
+ panel_applet_settings_new (PANEL_APPLET (pager->applet),
+@@ -308,16 +308,14 @@ workspace_switcher_applet_fill (PanelApplet *applet)
+ GtkActionGroup *action_group;
+ GtkAction *action;
+ gboolean display_names;
+-
+- panel_applet_add_preferences (applet, "/schemas/apps/workspace_switcher_applet/prefs", NULL);
+-
++
+ pager = g_new0 (PagerData, 1);
+
+ pager->applet = GTK_WIDGET (applet);
+
+ panel_applet_set_flags (PANEL_APPLET (pager->applet), PANEL_APPLET_EXPAND_MINOR);
+
+- setup_gconf (pager);
++ setup_gsettings (pager);
+
+ pager->n_rows = g_settings_get_int (pager->settings, "num-rows");
+
+diff --git a/configure.ac b/configure.ac
+index ae7e4d7..d85d6bb 100644
+--- configure.ac
++++ configure.ac
+@@ -66,7 +66,7 @@ AC_CHECK_FUNCS(_NSGetEnviron)
+ LIBGNOME_DESKTOP_REQUIRED=2.91.0
+ GDK_PIXBUF_REQUIRED=2.25.2
+ PANGO_REQUIRED=1.15.4
+-GLIB_REQUIRED=2.31.14
++GLIB_REQUIRED=2.35.0
+ GTK_REQUIRED=3.3.8
+ LIBWNCK_REQUIRED=2.91.0
+ GCONF_REQUIRED=2.6.1
+@@ -78,6 +78,7 @@ CAIRO_REQUIRED=1.0.0
+ GWEATHER_REQUIRED=3.5.1
+ DBUS_GLIB_REQUIRED=0.80
+ DCONF_REQUIRED=0.13.4
++LIBRSVG_REQUIRED=2.36.2
+
+ dnl pkg-config dependency checks
+
+@@ -131,10 +132,15 @@ PKG_CHECK_MODULES(TZ, gio-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(TZ_CFLAGS)
+ AC_SUBST(TZ_LIBS)
+
+-PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1)
++PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED gweather-3.0 >= $GWEATHER_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1)
+ AC_SUBST(CLOCK_CFLAGS)
+ AC_SUBST(CLOCK_LIBS)
+
++PKG_CHECK_MODULES(GWEATHER, gweather-3.0 >= 3.9.2, HAVE_GWEATHER_3_9_2_OR_NEWER=yes, HAVE_GWEATHER_3_9_2_OR_NEWER=no)
++if test "x$HAVE_GWEATHER_3_9_2_OR_NEWER" = "xyes" ; then
++ AC_DEFINE(HAVE_GWEATHER_3_9_2_OR_NEWER, 1, [Defined if Gweather version is 3.9.2 or newer])
++fi
++
+ # Check whether to enable e-d-s support for clock applet
+ AC_MSG_CHECKING([whether to enable evolution-data-server support])
+ AC_ARG_ENABLE([eds],
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 95c9670..4f52f48 100644
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -35,8 +35,8 @@ session_in_files = gnome-flashback.session.desktop.in
+ session_DATA = $(session_in_files:.session.desktop.in=.session)
+
+ xsessiondir = $(datadir)/xsessions
+-xsession_in_in_files = gnome-fallback.desktop.in.in
+-xsession_in_files = gnome-fallback.desktop.in
++xsession_in_in_files = gnome-flashback.desktop.in.in
++xsession_in_files = gnome-flashback.desktop.in
+ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+
+ %.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+diff --git a/data/gnome-fallback.desktop.in.in b/data/gnome-fallback.desktop.in.in
+deleted file mode 100644
+index 66354a7..0000000
+--- data/gnome-fallback.desktop.in.in
++++ /dev/null
+@@ -1,7 +0,0 @@
+-[Desktop Entry]
+-_Name=GNOME Flashback
+-_Comment=This session logs you into GNOME with the traditional panel
+-Exec=@libexecdir@/gnome-session-flashback
+-TryExec=@libexecdir@/gnome-session-flashback
+-Icon=
+-Type=Application
+diff --git a/data/gnome-flashback.desktop.in.in b/data/gnome-flashback.desktop.in.in
+new file mode 100644
+index 0000000..915c759
+--- /dev/null
++++ data/gnome-flashback.desktop.in.in
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++_Name=GNOME Flashback (Metacity)
++_Comment=This session logs you into GNOME with the traditional panel
++Exec=@libexecdir@/gnome-session-flashback
++TryExec=@libexecdir@/gnome-session-flashback
++Icon=
++Type=Application
+diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in
+index 23f1f09..5ba2d46 100644
+--- data/gnome-flashback.session.desktop.in
++++ data/gnome-flashback.session.desktop.in
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+-_Name=GNOME Flashback
++_Name=GNOME Flashback (Metacity)
+ RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;
+diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
+index bdb5062..77cb9f9 100644
+--- gnome-panel/applet.c
++++ gnome-panel/applet.c
+@@ -557,7 +557,7 @@ panel_applet_position_menu (GtkMenu *menu,
+ {
+ GtkAllocation allocation;
+ GtkRequisition requisition;
+- GdkModifierType modifier_mask;
++ GdkDevice *device;
+ GdkScreen *screen;
+ GtkWidget *parent;
+ int menu_x = 0;
+@@ -574,7 +574,8 @@ panel_applet_position_menu (GtkMenu *menu,
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
+
+ gdk_window_get_origin (gtk_widget_get_window (applet), &menu_x, &menu_y);
+- gdk_window_get_device_position(gtk_widget_get_window (applet), gtk_get_current_event_device (), &pointer_x, &pointer_y, &modifier_mask);
++ device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (applet)));
++ gdk_window_get_device_position(gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL);
+
+ gtk_widget_get_allocation (applet, &allocation);
+
+diff --git a/gnome-panel/gnome-desktop-item-edit.c b/gnome-panel/gnome-desktop-item-edit.c
+index 6075f69..0835661 100644
+--- gnome-panel/gnome-desktop-item-edit.c
++++ gnome-panel/gnome-desktop-item-edit.c
+@@ -14,8 +14,6 @@
+ /* FIXME Symbols needed by panel-util.c - sucky */
+ #include "applet.h"
+ GSList *panel_applet_list_applets (void) { return NULL; }
+-#include "panel-gconf.h"
+-GConfClient *panel_gconf_get_client (void) { return NULL; }
+ #include "panel-bindings.h"
+ guint panel_bindings_get_mouse_button_modifier_keymask (void) { return 0; }
+ #include "panel-toplevel.h"
+diff --git a/gnome-panel/launcher.c b/gnome-panel/launcher.c
+index 1997809..6e629e6 100644
+--- gnome-panel/launcher.c
++++ gnome-panel/launcher.c
+@@ -730,6 +730,8 @@ launcher_properties (Launcher *launcher)
+ launcher->key_file,
+ launcher->location,
+ _("Launcher Properties"));
++ gtk_window_set_screen (GTK_WINDOW (launcher->prop_dialog),
++ gtk_widget_get_screen (launcher->button));
+
+ panel_widget_register_open_dialog (PANEL_WIDGET
+ (gtk_widget_get_parent (launcher->info->widget)),
+diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am
+index f12dee8..6469b3c 100644
+--- gnome-panel/libpanel-applet-private/Makefile.am
++++ gnome-panel/libpanel-applet-private/Makefile.am
+@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
+ -I$(srcdir) \
+ -I$(top_srcdir)/gnome-panel \
+ -I$(top_builddir)/gnome-panel \
+- -I$(top_builddir)/gnome-panel/libpanel-applets-private \
++ -I$(top_builddir)/gnome-panel/libpanel-applet-private \
+ -I$(top_builddir)/gnome-panel/libpanel-util \
+ -DDATADIR=\""$(datadir)"\" \
+ -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
+diff --git a/gnome-panel/panel-action-button.c b/gnome-panel/panel-action-button.c
+index 0eec0fd..9a32ed8 100644
+--- gnome-panel/panel-action-button.c
++++ gnome-panel/panel-action-button.c
+@@ -40,7 +40,6 @@
+ #include <libpanel-util/panel-show.h>
+
+ #include "applet.h"
+-#include "panel-gconf.h"
+ #include "panel-typebuiltins.h"
+ #include "panel-force-quit.h"
+ #include "panel-util.h"
+@@ -69,7 +68,12 @@ struct _PanelActionButtonPrivate {
+ guint dnd_enabled : 1;
+ };
+
+-static GConfEnumStringPair panel_action_type_map [] = {
++typedef struct {
++ gint enum_value;
++ const gchar* str;
++} PanelEnumStringPair;
++
++static PanelEnumStringPair panel_action_type_map [] = {
+ { PANEL_ACTION_NONE, "none" },
+ { PANEL_ACTION_LOCK, "lock" },
+ { PANEL_ACTION_LOGOUT, "logout" },
+@@ -81,6 +85,35 @@ static GConfEnumStringPair panel_action_type_map [] = {
+ { 0, NULL },
+ };
+
++static gboolean
++panel_string_to_enum (const gchar *str, gint *enum_value_retloc)
++{
++ int i = 0;
++ while (panel_action_type_map[i].str != NULL)
++ {
++ if (g_ascii_strcasecmp (panel_action_type_map[i].str, str) == 0)
++ {
++ *enum_value_retloc = panel_action_type_map[i].enum_value;
++ return TRUE;
++ }
++ ++i;
++ }
++ return FALSE;
++}
++
++static const gchar*
++panel_enum_to_string (gint enum_value)
++{
++ int i = 0;
++ while (panel_action_type_map[i].str != NULL)
++ {
++ if (panel_action_type_map[i].enum_value == enum_value)
++ return panel_action_type_map[i].str;
++ ++i;
++ }
++ return NULL;
++}
++
+ /* Lock Screen
+ */
+ static void
+@@ -508,7 +541,7 @@ panel_action_button_drag_data_get (GtkWidget *widget,
+ button = PANEL_ACTION_BUTTON (widget);
+
+ drag_data = g_strdup_printf ("ACTION:%s:%d",
+- gconf_enum_to_string (panel_action_type_map, button->priv->type),
++ panel_enum_to_string (button->priv->type),
+ panel_find_applet_index (widget));
+
+ gtk_selection_data_set (
+@@ -656,12 +689,8 @@ panel_action_button_create (PanelToplevel *toplevel,
+ int pack_index,
+ PanelActionButtonType type)
+ {
+- const char *detail;
+-
+- detail = gconf_enum_to_string (panel_action_type_map, type);
+-
+ panel_layout_object_create (PANEL_OBJECT_ACTION,
+- detail,
++ panel_enum_to_string (type),
+ panel_toplevel_get_id (toplevel),
+ pack_type, pack_index);
+ }
+@@ -727,7 +756,7 @@ panel_action_button_load_from_drag (PanelToplevel *toplevel,
+ return retval;
+ }
+
+- if (!gconf_string_to_enum (panel_action_type_map, elements [1], (gpointer) &type)) {
++ if (!panel_string_to_enum (elements [1], (gpointer) &type)) {
+ g_strfreev (elements);
+ return retval;
+ }
+diff --git a/gnome-panel/panel-bindings.c b/gnome-panel/panel-bindings.c
+index 3bf3b97..2e3be89 100644
+--- gnome-panel/panel-bindings.c
++++ gnome-panel/panel-bindings.c
+@@ -29,53 +29,63 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+
+-#include "panel-gconf.h"
++#include "panel-schemas.h"
+ #include "panel-toplevel.h"
+ #include "panel-xutils.h"
+
+-#define BINDINGS_PREFIX "/apps/metacity/window_keybindings"
+-#define MOUSE_MODIFIER_DIR "/apps/metacity/general"
+-#define MOUSE_MODIFIER_KEY "/apps/metacity/general/mouse_button_modifier"
+ #define DEFAULT_MOUSE_MODIFIER GDK_MOD1_MASK
+
+ typedef struct {
+- char *key;
+- char *signal;
+ guint keyval;
+ GdkModifierType modifiers;
++} KeyBinding;
++
++typedef struct {
++ char *key;
++ char *signal;
++ GSList *list;
+ } PanelBinding;
+
+ static gboolean initialised = FALSE;
++static GSettings *preferences = NULL;
++static GSettings *keybindings = NULL;
+
+ static PanelBinding bindings [] = {
+- { "activate_window_menu", "popup-panel-menu", 0, 0 },
+- { "toggle_maximized", "toggle-expand", 0, 0 },
+- { "maximize", "expand", 0, 0 },
+- { "unmaximize", "unexpand", 0, 0 },
+- { "toggle_shaded", "toggle-hidden", 0, 0 },
+- { "begin_move", "begin-move", 0, 0 },
+- { "begin_resize", "begin-resize", 0, 0 },
++ { GNOME_DESKTOP_WM_KEYBINDINGS_ACTIVATE_WINDOW_MENU_KEY, "popup-panel-menu", NULL },
++ { GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_MAXIMIZED_KEY, "toggle-expand", NULL },
++ { GNOME_DESKTOP_WM_KEYBINDINGS_MAXIMIZE_KEY, "expand", NULL },
++ { GNOME_DESKTOP_WM_KEYBINDINGS_UNMAXIMIZE_KEY, "unexpand", NULL },
++ { GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_SHADED_KEY, "toggle-hidden", NULL },
++ { GNOME_DESKTOP_WM_KEYBINDINGS_BEGIN_MOVE_KEY, "begin-move", NULL },
++ { GNOME_DESKTOP_WM_KEYBINDINGS_BEGIN_RESIZE_KEY, "begin-resize", NULL },
+ };
+
+ static guint mouse_button_modifier_keymask = DEFAULT_MOUSE_MODIFIER;
+
+ static void
+-panel_binding_set_from_string (PanelBinding *binding,
+- const char *str)
++panel_binding_set_from_string (PanelBinding *binding, const char *str)
+ {
+- g_assert (binding->keyval == 0);
+- g_assert (binding->modifiers == 0);
++ KeyBinding *tmp;
+
+ if (!str || !str [0] || !strcmp (str, "disabled")) {
+- binding->keyval = 0;
+- binding->modifiers = 0;
++ g_slist_foreach (binding->list, (GFunc)g_free, NULL);
++ g_slist_free (binding->list);
++ binding->list = NULL;
+ return;
+ }
+
+- gtk_accelerator_parse (str, &binding->keyval, &binding->modifiers);
+- if (binding->keyval == 0 && binding->modifiers == 0) {
++ tmp = g_new(KeyBinding, 1);
++ tmp->keyval = 0;
++ tmp->modifiers = 0;
++
++ gtk_accelerator_parse (str, &tmp->keyval, &tmp->modifiers);
++
++ if (tmp->keyval == 0 && tmp->modifiers == 0) {
++ g_free (tmp);
+ g_warning ("Unable to parse binding '%s'\n", str);
+ return;
++ } else {
++ binding->list = g_slist_append (binding->list, tmp);
+ }
+ }
+
+@@ -98,68 +108,68 @@ get_binding_set (GtkBindingSet *binding_set)
+ }
+
+ static void
+-panel_binding_clear_entry (PanelBinding *binding,
+- GtkBindingSet *binding_set)
++panel_binding_clear_entry (PanelBinding *binding, GtkBindingSet *binding_set)
+ {
++ KeyBinding *b;
++ GSList *l;
++
+ binding_set = get_binding_set (binding_set);
+
+- gtk_binding_entry_remove (binding_set, binding->keyval, binding->modifiers);
++ for (l = binding->list; l != NULL; l = l->next) {
++ b = l->data;
++ gtk_binding_entry_remove (binding_set, b->keyval, b->modifiers);
++ }
++
++ g_slist_foreach (binding->list, (GFunc)g_free, NULL);
++ g_slist_free (binding->list);
++ binding->list = NULL;
+ }
+
+ static void
+-panel_binding_set_entry (PanelBinding *binding,
+- GtkBindingSet *binding_set)
++panel_binding_set_entry (PanelBinding *binding, GtkBindingSet *binding_set)
+ {
++ KeyBinding *b;
++ GSList *l;
++
+ binding_set = get_binding_set (binding_set);
+
+- gtk_binding_entry_add_signal (binding_set,
+- binding->keyval,
+- binding->modifiers,
+- binding->signal,
+- 0);
++ for (l = binding->list; l != NULL; l = l->next) {
++ b = l->data;
++ gtk_binding_entry_add_signal (binding_set, b->keyval, b->modifiers, binding->signal, 0);
++ }
+ }
+
+ static void
+-panel_binding_changed (GConfClient *client,
+- guint cnxn_id,
+- GConfEntry *entry,
+- PanelBinding *binding)
++panel_binding_changed (GSettings *settings, const gchar *key, PanelBinding *binding)
+ {
+- GConfValue *value;
++ gchar **array;
++ gint i;
+
+- if (binding->keyval)
++ if (binding->list != NULL)
+ panel_binding_clear_entry (binding, NULL);
+
+- binding->keyval = 0;
+- binding->modifiers = 0;
+-
+- value = gconf_entry_get_value (entry);
++ array = g_settings_get_strv (settings, key);
+
+- if (!value || value->type != GCONF_VALUE_STRING)
+- return;
++ if (array) {
++ for (i = 0; array[i] != NULL; i++) {
++ panel_binding_set_from_string (binding, array[i]);
++ }
+
+- panel_binding_set_from_string (binding, gconf_value_get_string (value));
++ g_strfreev (array);
++ }
+
+- if (!binding->keyval)
++ if (!binding->list)
+ return;
+
+ panel_binding_set_entry (binding, NULL);
+ }
+
+ static void
+-panel_binding_watch (PanelBinding *binding,
+- const char *key)
++panel_binding_watch (PanelBinding *binding, const char *key)
+ {
+- GError *error = NULL;
+-
+- gconf_client_notify_add (panel_gconf_get_client (), key,
+- (GConfClientNotifyFunc) panel_binding_changed,
+- binding, NULL, &error);
+- if (error) {
+- g_warning ("Error watching gconf key '%s': %s",
+- key, error->message);
+- g_error_free (error);
+- }
++ gchar *signal_name = g_strdup_printf ("changed::%s", key);
++ g_signal_connect (keybindings, signal_name, G_CALLBACK (panel_binding_changed), binding);
++ g_free (signal_name);
+ }
+
+ /*
+@@ -185,95 +195,47 @@ panel_bindings_mouse_modifier_set_from_string (const char *str)
+ }
+
+ static void
+-panel_bindings_mouse_modifier_changed (GConfClient *client,
+- guint cnxn_id,
+- GConfEntry *entry,
+- gpointer user_data)
++panel_bindings_mouse_modifier_changed (GSettings *settings, const gchar *key)
+ {
+- GConfValue *value;
+- const char *str;
+-
+- value = gconf_entry_get_value (entry);
+-
+- if (!value || value->type != GCONF_VALUE_STRING)
+- return;
+-
+- str = gconf_value_get_string (value);
+- panel_bindings_mouse_modifier_set_from_string (str);
++ panel_bindings_mouse_modifier_set_from_string (g_settings_get_string (settings, key));
+ }
+
+ static void
+ panel_bindings_initialise (void)
+ {
+- GConfClient *client;
+- GError *error;
+ int i;
++ int j;
+ char *str;
++ gchar **array;
+
+ if (initialised)
+ return;
+
+- client = panel_gconf_get_client ();
+-
+- error = NULL;
+- gconf_client_add_dir (client, BINDINGS_PREFIX,
+- GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
+- if (error) {
+- g_warning ("Error loading gconf directory '%s': %s",
+- BINDINGS_PREFIX, error->message),
+- g_error_free (error);
+- }
++ preferences = g_settings_new (GNOME_DESKTOP_WM_PREFERENCES_SCHEMA);
++ keybindings = g_settings_new (GNOME_DESKTOP_WM_KEYBINDINGS_SCHEMA);
+
+ for (i = 0; i < G_N_ELEMENTS (bindings); i++) {
+- const char *key;
++ array = g_settings_get_strv (keybindings, bindings [i].key);
+
+- key = panel_gconf_sprintf ("%s/%s", BINDINGS_PREFIX, bindings [i].key);
++ if (array) {
++ for (j = 0; array[j] != NULL; j++) {
++ panel_binding_set_from_string (&bindings [i], array[j]);
++ }
+
+- error = NULL;
+- str = gconf_client_get_string (client, key, &error);
+- if (error) {
+- g_warning ("Error getting value for '%s': %s",
+- key, error->message);
+- g_error_free (error);
+- continue;
++ g_strfreev (array);
+ }
+
+- panel_binding_set_from_string (&bindings [i], str);
+- panel_binding_watch (&bindings [i], key);
+-
+- g_free (str);
++ panel_binding_watch (&bindings [i], bindings [i].key);
+ }
+
+ /* mouse button modifier */
+- error = NULL;
+- gconf_client_add_dir (client, MOUSE_MODIFIER_DIR,
+- GCONF_CLIENT_PRELOAD_NONE, &error);
+- if (error) {
+- g_warning ("Error loading gconf directory '%s': %s",
+- MOUSE_MODIFIER_DIR, error->message),
+- g_error_free (error);
+- }
+-
+- error = NULL;
+- gconf_client_notify_add (client, MOUSE_MODIFIER_KEY,
+- panel_bindings_mouse_modifier_changed,
+- NULL, NULL, &error);
+- if (error) {
+- g_warning ("Error watching gconf key '%s': %s",
+- MOUSE_MODIFIER_KEY, error->message);
+- g_error_free (error);
+- }
++ g_signal_connect (preferences, "changed::" GNOME_DESKTOP_WM_PREFERENCES_MOUSE_BUTTON_MODIFIER_KEY,
++ G_CALLBACK (panel_bindings_mouse_modifier_changed),
++ NULL);
+
+- error = NULL;
+- str = gconf_client_get_string (client, MOUSE_MODIFIER_KEY, &error);
+- if (error) {
+- g_warning ("Error getting value for '%s': %s",
+- MOUSE_MODIFIER_KEY, error->message);
+- g_error_free (error);
+- } else {
+- panel_bindings_mouse_modifier_set_from_string (str);
+- g_free (str);
+- }
++ str = g_settings_get_string (preferences, GNOME_DESKTOP_WM_PREFERENCES_MOUSE_BUTTON_MODIFIER_KEY);
++ panel_bindings_mouse_modifier_set_from_string (str);
++ g_free (str);
+
+ initialised = TRUE;
+ }
+@@ -287,7 +249,7 @@ panel_bindings_set_entries (GtkBindingSet *binding_set)
+ panel_bindings_initialise ();
+
+ for (i = 0; i < G_N_ELEMENTS (bindings); i++) {
+- if (!bindings [i].keyval)
++ if (!bindings [i].list)
+ continue;
+
+ panel_binding_set_entry (&bindings [i], binding_set);
+diff --git a/gnome-panel/panel-ditem-editor.c b/gnome-panel/panel-ditem-editor.c
+index 079e416..80a4f5b 100644
+--- gnome-panel/panel-ditem-editor.c
++++ gnome-panel/panel-ditem-editor.c
+@@ -61,7 +61,7 @@ struct _PanelDItemEditorPrivate
+ PanelDitemSaveUri save_uri;
+ gpointer save_uri_data;
+
+- GtkWidget *table;
++ GtkWidget *grid;
+ GtkWidget *type_label;
+ GtkWidget *type_combo;
+ GtkWidget *name_label;
+@@ -508,29 +508,16 @@ label_new_with_mnemonic (const char *text)
+ }
+
+ static inline void
+-table_attach_label (GtkTable *table,
+- GtkWidget *label,
+- int left,
+- int right,
+- int top,
+- int bottom)
++grid_attach_label (GtkGrid *grid, GtkWidget *label, int left, int top, int width, int height)
+ {
+- gtk_table_attach (table, label, left, right, top, bottom,
+- GTK_FILL, GTK_FILL,
+- 0, 0);
++ gtk_grid_attach (grid, label, left, top, width, height);
+ }
+
+ static inline void
+-table_attach_entry (GtkTable *table,
+- GtkWidget *entry,
+- int left,
+- int right,
+- int top,
+- int bottom)
++grid_attach_entry (GtkGrid *grid, GtkWidget *entry, int left, int top, int width, int height)
+ {
+- gtk_table_attach (table, entry, left, right, top, bottom,
+- GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_FILL,
+- 0, 0);
++ gtk_widget_set_hexpand (entry, TRUE);
++ gtk_grid_attach (grid, entry, left, top, width, height);
+ }
+
+ static void
+@@ -604,13 +591,12 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog)
+ dialog_vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ gtk_box_set_spacing (GTK_BOX (dialog_vbox), 2);
+
+- priv->table = gtk_table_new (4, 3, FALSE);
+- gtk_container_set_border_width (GTK_CONTAINER (priv->table), 5);
+- gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6);
+- gtk_table_set_col_spacings (GTK_TABLE (priv->table), 12);
+- gtk_box_pack_start (GTK_BOX (dialog_vbox),
+- priv->table, TRUE, TRUE, 0);
+- gtk_widget_show (priv->table);
++ priv->grid = gtk_grid_new ();
++ gtk_container_set_border_width (GTK_CONTAINER (priv->grid), 5);
++ gtk_grid_set_row_spacing (GTK_GRID (priv->grid), 6);
++ gtk_grid_set_column_spacing (GTK_GRID (priv->grid), 12);
++ gtk_box_pack_start (GTK_BOX (dialog_vbox), priv->grid, TRUE, TRUE, 0);
++ gtk_widget_show (priv->grid);
+
+ /* Type */
+ priv->type_label = label_new_with_mnemonic (_("_Type:"));
+@@ -630,9 +616,7 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog)
+ priv->icon_chooser = panel_icon_chooser_new (NULL);
+ panel_icon_chooser_set_fallback_icon_name (PANEL_ICON_CHOOSER (priv->icon_chooser),
+ PANEL_ICON_LAUNCHER);
+- gtk_table_attach (GTK_TABLE (priv->table), priv->icon_chooser,
+- 0, 1, 0, 2,
+- 0, 0, 0, 0);
++ gtk_grid_attach (GTK_GRID (priv->grid), priv->icon_chooser, 0, 0, 1, 2);
+ gtk_widget_show (priv->icon_chooser);
+
+ /* Command */
+@@ -726,25 +710,17 @@ panel_ditem_editor_setup_ui (PanelDItemEditor *dialog)
+ GtkTreeModel *model;
+ PanelDItemEditorType buf_type;
+
+- table_attach_label (GTK_TABLE (priv->table), priv->type_label,
+- 1, 2, 0, 1);
+- table_attach_entry (GTK_TABLE (priv->table), priv->type_combo,
+- 2, 3, 0, 1);
++ grid_attach_label (GTK_GRID (priv->grid), priv->type_label, 1, 0, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->type_combo, 2, 0, 1, 1);
+
+- table_attach_label (GTK_TABLE (priv->table), priv->name_label,
+- 1, 2, 1, 2);
+- table_attach_entry (GTK_TABLE (priv->table), priv->name_entry,
+- 2, 3, 1, 2);
++ grid_attach_label (GTK_GRID (priv->grid), priv->name_label, 1, 1, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->name_entry, 2, 1, 1, 1);
+
+- table_attach_label (GTK_TABLE (priv->table), priv->command_label,
+- 1, 2, 2, 3);
+- table_attach_entry (GTK_TABLE (priv->table), priv->command_hbox,
+- 2, 3, 2, 3);
++ grid_attach_label (GTK_GRID (priv->grid), priv->command_label, 1, 2, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->command_hbox, 2, 2, 1, 1);
+
+- table_attach_label (GTK_TABLE (priv->table), priv->comment_label,
+- 1, 2, 3, 4);
+- table_attach_entry (GTK_TABLE (priv->table), priv->comment_entry,
+- 2, 3, 3, 4);
++ grid_attach_label (GTK_GRID (priv->grid), priv->comment_label, 1, 3, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->comment_entry, 2, 3, 1, 1);
+
+ /* FIXME: hack hack hack */
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->type_combo));
+@@ -760,30 +736,20 @@ panel_ditem_editor_setup_ui (PanelDItemEditor *dialog)
+ }
+ } while (gtk_tree_model_iter_next (model, &iter));
+ } else if (type == PANEL_DITEM_EDITOR_TYPE_DIRECTORY) {
+- table_attach_label (GTK_TABLE (priv->table), priv->name_label,
+- 1, 2, 0, 1);
+- table_attach_entry (GTK_TABLE (priv->table), priv->name_entry,
+- 2, 3, 0, 1);
+-
+- table_attach_label (GTK_TABLE (priv->table), priv->comment_label,
+- 1, 2, 1, 2);
+- table_attach_entry (GTK_TABLE (priv->table), priv->comment_entry,
+- 2, 3, 1, 2);
++ grid_attach_label (GTK_GRID (priv->grid), priv->name_label, 1, 0, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->name_entry, 2, 0, 1, 1);
++
++ grid_attach_label (GTK_GRID (priv->grid), priv->comment_label, 1, 1, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->comment_entry, 2, 1, 1, 1);
+ } else {
+- table_attach_label (GTK_TABLE (priv->table), priv->name_label,
+- 1, 2, 0, 1);
+- table_attach_entry (GTK_TABLE (priv->table), priv->name_entry,
+- 2, 3, 0, 1);
+-
+- table_attach_label (GTK_TABLE (priv->table), priv->command_label,
+- 1, 2, 1, 2);
+- table_attach_entry (GTK_TABLE (priv->table), priv->command_hbox,
+- 2, 3, 1, 2);
+-
+- table_attach_label (GTK_TABLE (priv->table), priv->comment_label,
+- 1, 2, 2, 3);
+- table_attach_entry (GTK_TABLE (priv->table), priv->comment_entry,
+- 2, 3, 2, 3);
++ grid_attach_label (GTK_GRID (priv->grid), priv->name_label, 1, 0, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->name_entry, 2, 0, 1, 1);
++
++ grid_attach_label (GTK_GRID (priv->grid), priv->command_label, 1, 1, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->command_hbox, 2, 1, 1, 1);
++
++ grid_attach_label (GTK_GRID (priv->grid), priv->comment_label, 1, 2, 1, 1);
++ grid_attach_entry (GTK_GRID (priv->grid), priv->comment_entry, 2, 2, 1, 1);
+ }
+
+ type_combo_changed (dialog);
+@@ -797,8 +763,7 @@ panel_ditem_editor_setup_ui (PanelDItemEditor *dialog)
+ focus_chain = g_list_prepend (focus_chain, priv->command_hbox);
+ focus_chain = g_list_prepend (focus_chain, priv->comment_entry);
+ focus_chain = g_list_reverse (focus_chain);
+- gtk_container_set_focus_chain (GTK_CONTAINER (priv->table),
+- focus_chain);
++ gtk_container_set_focus_chain (GTK_CONTAINER (priv->grid), focus_chain);
+ g_list_free (focus_chain);
+
+ gtk_widget_grab_focus (priv->name_entry);
+diff --git a/gnome-panel/panel-layout.c b/gnome-panel/panel-layout.c
+index e5cef45..7c55543 100644
+--- gnome-panel/panel-layout.c
++++ gnome-panel/panel-layout.c
+@@ -350,7 +350,6 @@ panel_layout_append_group_helper (GKeyFile *keyfile,
+ const char *id_list_key,
+ const char *schema,
+ const char *path_prefix,
+- const char *default_prefix,
+ PanelLayoutKeyDefinition *key_definitions,
+ int key_definitions_len,
+ gboolean dry_run,
+@@ -540,7 +539,6 @@ panel_layout_append_group (GKeyFile *keyfile,
+ PANEL_LAYOUT_TOPLEVEL_ID_LIST_KEY,
+ PANEL_TOPLEVEL_SCHEMA,
+ PANEL_LAYOUT_TOPLEVEL_PATH,
+- PANEL_LAYOUT_TOPLEVEL_DEFAULT_PREFIX,
+ panel_layout_toplevel_keys,
+ G_N_ELEMENTS (panel_layout_toplevel_keys),
+ dry_run, error, "toplevel");
+@@ -553,7 +551,6 @@ panel_layout_append_group (GKeyFile *keyfile,
+ PANEL_LAYOUT_OBJECT_ID_LIST_KEY,
+ PANEL_OBJECT_SCHEMA,
+ PANEL_LAYOUT_OBJECT_PATH,
+- PANEL_LAYOUT_OBJECT_DEFAULT_PREFIX,
+ panel_layout_object_keys,
+ G_N_ELEMENTS (panel_layout_object_keys),
+ dry_run, error, "object");
+@@ -744,6 +741,36 @@ panel_layout_get_instance_settings (GSettings *settings_object,
+ return settings_instance;
+ }
+
++static char *
++panel_layout_object_generate_id (const char *iid)
++{
++ GString *generated_id;
++ const char *applet;
++ char old;
++
++ applet = g_strrstr (iid, "::");
++
++ if (applet == NULL)
++ return NULL;
++
++ generated_id = g_string_new ("");
++ applet += 2;
++ old = applet[0];
++
++ while (applet[0] != '\0') {
++ if (g_ascii_isupper (applet[0]) && old != ':' && g_ascii_islower (applet[1]) && generated_id->len != 0) {
++ g_string_append_printf (generated_id, "-%c", g_ascii_tolower (applet[0]));
++ } else {
++ g_string_append_c (generated_id, applet[0] != ':' ? g_ascii_tolower (applet[0]) : '-');
++ }
++
++ old = applet[0];
++ applet += 1;
++ }
++
++ return g_string_free (generated_id, FALSE);
++}
++
+ char *
+ panel_layout_object_create_start (PanelObjectType type,
+ const char *type_detail,
+@@ -756,6 +783,7 @@ panel_layout_object_create_start (PanelObjectType type,
+ char *path;
+ GSettings *settings_object;
+ char *iid;
++ char *try_id;
+
+ if (settings)
+ *settings = NULL;
+@@ -764,10 +792,11 @@ panel_layout_object_create_start (PanelObjectType type,
+ if (!iid)
+ return NULL;
+
++ try_id = panel_layout_object_generate_id (iid);
+ unique_id = panel_layout_find_free_id (PANEL_LAYOUT_OBJECT_ID_LIST_KEY,
+ PANEL_OBJECT_SCHEMA,
+ PANEL_LAYOUT_OBJECT_PATH,
+- NULL, -1);
++ try_id, -1);
+
+ path = g_strdup_printf ("%s%s/", PANEL_LAYOUT_OBJECT_PATH, unique_id);
+ settings_object = g_settings_new_with_path (PANEL_OBJECT_SCHEMA, path);
+@@ -786,6 +815,7 @@ panel_layout_object_create_start (PanelObjectType type,
+ PANEL_OBJECT_PACK_INDEX_KEY,
+ pack_index);
+
++ g_free (try_id);
+ g_free (iid);
+
+ if (settings)
+diff --git a/gnome-panel/panel-menu-items.c b/gnome-panel/panel-menu-items.c
+index be60a00..4aa59c6 100644
+--- gnome-panel/panel-menu-items.c
++++ gnome-panel/panel-menu-items.c
+@@ -54,7 +54,6 @@
+
+ #include "menu.h"
+ #include "panel-action-button.h"
+-#include "panel-gconf.h"
+ #include "panel-globals.h"
+ #include "panel-icon-names.h"
+ #include "panel-lockdown.h"
+@@ -62,13 +61,9 @@
+ #include "panel-recent.h"
+ #include "panel-stock-icons.h"
+ #include "panel-util.h"
++#include "panel-schemas.h"
+
+-#define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
+-#define DESKTOP_IS_HOME_DIR_KEY "/apps/nautilus/preferences/desktop_is_home_dir"
+-#define NAMES_DIR "/apps/nautilus/desktop"
+-#define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
+-#define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name"
+-#define MAX_ITEMS_OR_SUBMENU 5
++#define MAX_ITEMS_OR_SUBMENU 8
+ #define MAX_BOOKMARK_ITEMS 100
+
+ G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
+@@ -1183,7 +1178,6 @@ panel_place_menu_item_create_menu (PanelPlaceMenuItem *place_item)
+ {
+ GtkWidget *places_menu;
+ GtkWidget *item;
+- char *gconf_name;
+ char *name;
+ char *uri;
+ GFile *file;
+@@ -1204,45 +1198,32 @@ panel_place_menu_item_create_menu (PanelPlaceMenuItem *place_item)
+ g_free (name);
+ g_free (uri);
+
+- if (!gconf_client_get_bool (panel_gconf_get_client (),
+- DESKTOP_IS_HOME_DIR_KEY,
+- NULL)) {
+- file = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
+- uri = g_file_get_uri (file);
+- g_object_unref (file);
+-
+- item = panel_menu_item_uri_new (
+- /* FIXME: if the dir changes, we'd need to update the drag data since the uri is not the same */
+- uri, PANEL_ICON_DESKTOP, NULL,
+- /* Translators: Desktop is used here as in
+- * "Desktop Folder" (this is not the Desktop
+- * environment). */
+- C_("Desktop Folder", "Desktop"),
+- _("Open the contents of your desktop in a folder"),
+- G_CALLBACK (activate_desktop_uri));
+- gtk_menu_shell_append (GTK_MENU_SHELL (places_menu), item);
++ file = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
++ uri = g_file_get_uri (file);
++ g_object_unref (file);
+
+- g_free (uri);
+- }
++ item = panel_menu_item_uri_new (
++ /* FIXME: if the dir changes, we'd need to update the drag data since the uri is not the same */
++ uri, PANEL_ICON_DESKTOP, NULL,
++ /* Translators: Desktop is used here as in
++ * "Desktop Folder" (this is not the Desktop
++ * environment). */
++ C_("Desktop Folder", "Desktop"),
++ _("Open the contents of your desktop in a folder"),
++ G_CALLBACK (activate_desktop_uri));
++ gtk_menu_shell_append (GTK_MENU_SHELL (places_menu), item);
++
++ g_free (uri);
+
+ panel_place_menu_item_append_gtk_bookmarks (places_menu);
+ add_menu_separator (places_menu);
+
+- gconf_name = gconf_client_get_string (panel_gconf_get_client (),
+- COMPUTER_NAME_KEY,
+- NULL);
+-
+- if (gconf_name == NULL) {
+- gconf_name = g_strdup (_("Computer"));
+- }
+-
+ item = panel_menu_item_uri_new ("computer://",
+ PANEL_ICON_COMPUTER, NULL,
+- gconf_name,
++ _("Computer"),
+ _("Browse all local and remote disks and folders accessible from this computer"),
+ G_CALLBACK (activate_uri));
+ gtk_menu_shell_append (GTK_MENU_SHELL (places_menu), item);
+- g_free (gconf_name);
+
+ panel_place_menu_item_append_local_gio (place_item, places_menu);
+ add_menu_separator (places_menu);
+@@ -1296,10 +1277,7 @@ panel_place_menu_item_recreate_menu (GtkWidget *widget)
+ }
+
+ static void
+-panel_place_menu_item_key_changed (GConfClient *client,
+- guint cnxn_id,
+- GConfEntry *entry,
+- GtkWidget *place_item)
++panel_place_menu_item_key_changed (GSettings *settings, const gchar *key, GtkWidget *place_item)
+ {
+ panel_place_menu_item_recreate_menu (place_item);
+ }
+@@ -1395,13 +1373,6 @@ panel_place_menu_item_finalize (GObject *object)
+ {
+ PanelPlaceMenuItem *menuitem = (PanelPlaceMenuItem *) object;
+
+- gconf_client_remove_dir (panel_gconf_get_client (),
+- DESKTOP_IS_HOME_DIR_DIR,
+- NULL);
+- gconf_client_remove_dir (panel_gconf_get_client (),
+- NAMES_DIR,
+- NULL);
+-
+ if (menuitem->priv->bookmarks_monitor != NULL) {
+ g_file_monitor_cancel (menuitem->priv->bookmarks_monitor);
+ g_object_unref (menuitem->priv->bookmarks_monitor);
+@@ -1488,27 +1459,13 @@ panel_place_menu_item_init (PanelPlaceMenuItem *menuitem)
+ GFile *bookmark;
+ char *bookmarks_filename;
+ GError *error;
++ GSettings *settings;
+
+ menuitem->priv = PANEL_PLACE_MENU_ITEM_GET_PRIVATE (menuitem);
+
+- gconf_client_add_dir (panel_gconf_get_client (),
+- DESKTOP_IS_HOME_DIR_DIR,
+- GCONF_CLIENT_PRELOAD_NONE,
+- NULL);
+- gconf_client_add_dir (panel_gconf_get_client (),
+- NAMES_DIR,
+- GCONF_CLIENT_PRELOAD_NONE,
+- NULL);
+-
+- panel_gconf_notify_add_while_alive (HOME_NAME_KEY,
+- (GConfClientNotifyFunc) panel_place_menu_item_key_changed,
+- G_OBJECT (menuitem));
+- panel_gconf_notify_add_while_alive (DESKTOP_IS_HOME_DIR_KEY,
+- (GConfClientNotifyFunc) panel_place_menu_item_key_changed,
+- G_OBJECT (menuitem));
+- panel_gconf_notify_add_while_alive (COMPUTER_NAME_KEY,
+- (GConfClientNotifyFunc) panel_place_menu_item_key_changed,
+- G_OBJECT (menuitem));
++ settings = g_settings_new (GNOME_NAUTILUS_DESKTOP_SCHEMA);
++ g_signal_connect (settings, "changed::" GNOME_NAUTILUS_DESKTOP_HOME_ICON_NAME_KEY,
++ G_CALLBACK (panel_place_menu_item_key_changed), menuitem);
+
+ menuitem->priv->recent_manager = gtk_recent_manager_get_default ();
+
+diff --git a/gnome-panel/panel-schemas.h b/gnome-panel/panel-schemas.h
+index a2543ac..469972b 100644
+--- gnome-panel/panel-schemas.h
++++ gnome-panel/panel-schemas.h
+@@ -29,9 +29,7 @@
+ #define PANEL_LAYOUT_OBJECT_ID_LIST_KEY "object-id-list"
+
+ #define PANEL_LAYOUT_TOPLEVEL_PATH "/org/gnome/gnome-panel/layout/toplevels/"
+-#define PANEL_LAYOUT_TOPLEVEL_DEFAULT_PREFIX "toplevel"
+ #define PANEL_LAYOUT_OBJECT_PATH "/org/gnome/gnome-panel/layout/objects/"
+-#define PANEL_LAYOUT_OBJECT_DEFAULT_PREFIX "object"
+ #define PANEL_LAYOUT_OBJECT_CONFIG_SUFFIX "instance-config/"
+
+ #define PANEL_TOPLEVEL_SCHEMA "org.gnome.gnome-panel.toplevel"
+@@ -77,4 +75,19 @@
+ #define PANEL_MENU_BUTTON_CUSTOM_ICON_KEY "custom-icon"
+ #define PANEL_MENU_BUTTON_MENU_PATH_KEY "menu-path"
+
++#define GNOME_NAUTILUS_DESKTOP_SCHEMA "org.gnome.nautilus.desktop"
++#define GNOME_NAUTILUS_DESKTOP_HOME_ICON_NAME_KEY "home-icon-name"
++
++#define GNOME_DESKTOP_WM_KEYBINDINGS_SCHEMA "org.gnome.desktop.wm.keybindings"
++#define GNOME_DESKTOP_WM_KEYBINDINGS_ACTIVATE_WINDOW_MENU_KEY "activate-window-menu"
++#define GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_MAXIMIZED_KEY "toggle-maximized"
++#define GNOME_DESKTOP_WM_KEYBINDINGS_MAXIMIZE_KEY "maximize"
++#define GNOME_DESKTOP_WM_KEYBINDINGS_UNMAXIMIZE_KEY "unmaximize"
++#define GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_SHADED_KEY "toggle-shaded"
++#define GNOME_DESKTOP_WM_KEYBINDINGS_BEGIN_MOVE_KEY "begin-move"
++#define GNOME_DESKTOP_WM_KEYBINDINGS_BEGIN_RESIZE_KEY "begin-resize"
++
++#define GNOME_DESKTOP_WM_PREFERENCES_SCHEMA "org.gnome.desktop.wm.preferences"
++#define GNOME_DESKTOP_WM_PREFERENCES_MOUSE_BUTTON_MODIFIER_KEY "mouse-button-modifier"
++
+ #endif /* __PANEL_SCHEMAS_H__ */
+diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
+index 5cb5d69..f8fb26e 100644
+--- gnome-panel/panel-toplevel.c
++++ gnome-panel/panel-toplevel.c
+@@ -149,7 +149,7 @@ struct _PanelToplevelPrivate {
+
+ PanelWidget *panel_widget;
+ PanelFrame *inner_frame;
+- GtkWidget *table;
++ GtkWidget *grid;
+ GtkWidget *hide_button_top;
+ GtkWidget *hide_button_bottom;
+ GtkWidget *hide_button_left;
+@@ -925,13 +925,14 @@ panel_toplevel_warp_pointer_increment (PanelToplevel *toplevel,
+ {
+ GdkScreen *screen;
+ GdkWindow *root_window;
+- GdkModifierType modifier_mask;
++ GdkDevice *device;
+ int new_x, new_y;
+
+ screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
+ root_window = gdk_screen_get_root_window (screen);
+
+- gdk_window_get_device_position(root_window, gtk_get_current_event_device (), &new_x, &new_y, &modifier_mask);
++ device = gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(GTK_WIDGET(toplevel))));
++ gdk_window_get_device_position(root_window, device, &new_x, &new_y, NULL);
+
+ switch (keyval) {
+ case GDK_KEY_Up:
+@@ -1258,10 +1259,8 @@ panel_toplevel_hide_button_clicked (PanelToplevel *toplevel,
+ static GtkWidget *
+ panel_toplevel_add_hide_button (PanelToplevel *toplevel,
+ GtkArrowType arrow_type,
+- int left_attach,
+- int right_attach,
+- int top_attach,
+- int bottom_attach)
++ int left,
++ int top)
+ {
+ GtkWidget *button;
+ AtkObject *obj;
+@@ -1310,17 +1309,8 @@ panel_toplevel_add_hide_button (PanelToplevel *toplevel,
+ G_CALLBACK (panel_toplevel_hide_button_event), toplevel);
+ g_signal_connect_swapped (button, "button_release_event",
+ G_CALLBACK (panel_toplevel_hide_button_event), toplevel);
+-
+- gtk_table_attach (GTK_TABLE (toplevel->priv->table),
+- button,
+- left_attach,
+- right_attach,
+- top_attach,
+- bottom_attach,
+- GTK_FILL,
+- GTK_FILL,
+- 0,
+- 0);
++
++ gtk_grid_attach (GTK_GRID (toplevel->priv->grid), button, left, top, 1, 1);
+
+ return button;
+ }
+@@ -2678,7 +2668,6 @@ static void
+ panel_toplevel_check_resize (GtkContainer *container)
+ {
+ GtkAllocation allocation;
+- GtkAllocation widget_allocation;
+ GtkRequisition requisition;
+ GtkWidget *widget;
+
+@@ -2687,17 +2676,12 @@ panel_toplevel_check_resize (GtkContainer *container)
+ if (!gtk_widget_get_visible (widget))
+ return;
+
+- requisition.width = -1;
+- requisition.height = -1;
+-
+ gtk_widget_get_preferred_size (widget, &requisition, NULL);
+- gtk_widget_get_allocation (widget, &widget_allocation);
++ gtk_widget_get_allocation (widget, &allocation);
+
+- if (widget_allocation.width != requisition.width ||
+- widget_allocation.height != requisition.height)
+- return;
++ allocation.width = requisition.width;
++ allocation.height = requisition.height;
+
+- allocation = widget_allocation;
+ gtk_widget_size_allocate (widget, &allocation);
+ }
+
+@@ -4200,19 +4184,12 @@ panel_toplevel_setup_widgets (PanelToplevel *toplevel)
+ {
+ GtkWidget *container;
+
+- toplevel->priv->table = gtk_table_new (3, 3, FALSE);
+-
+- toplevel->priv->hide_button_top =
+- panel_toplevel_add_hide_button (toplevel, GTK_ARROW_UP, 1, 2, 0, 1);
++ toplevel->priv->grid = gtk_grid_new ();
+
+- toplevel->priv->hide_button_bottom =
+- panel_toplevel_add_hide_button (toplevel, GTK_ARROW_DOWN, 1, 2, 2, 3);
+-
+- toplevel->priv->hide_button_left =
+- panel_toplevel_add_hide_button (toplevel, GTK_ARROW_LEFT, 0, 1, 1, 2);
+-
+- toplevel->priv->hide_button_right =
+- panel_toplevel_add_hide_button (toplevel, GTK_ARROW_RIGHT, 2, 3, 1, 2);
++ toplevel->priv->hide_button_top = panel_toplevel_add_hide_button (toplevel, GTK_ARROW_UP, 1, 0);
++ toplevel->priv->hide_button_bottom = panel_toplevel_add_hide_button (toplevel, GTK_ARROW_DOWN, 1, 2);
++ toplevel->priv->hide_button_left = panel_toplevel_add_hide_button (toplevel, GTK_ARROW_LEFT, 0, 1);
++ toplevel->priv->hide_button_right = panel_toplevel_add_hide_button (toplevel, GTK_ARROW_RIGHT, 2, 1);
+
+ if (toplevel->priv->orientation & PANEL_HORIZONTAL_MASK) {
+ gtk_widget_show (toplevel->priv->hide_button_left);
+@@ -4224,13 +4201,10 @@ panel_toplevel_setup_widgets (PanelToplevel *toplevel)
+
+ toplevel->priv->inner_frame = g_object_new (PANEL_TYPE_FRAME, NULL);
+
+- gtk_table_attach (GTK_TABLE (toplevel->priv->table),
+- GTK_WIDGET (toplevel->priv->inner_frame),
+- 1, 2,
+- 1, 2,
+- GTK_FILL | GTK_EXPAND | GTK_SHRINK,
+- GTK_FILL | GTK_EXPAND | GTK_SHRINK,
+- 0, 0);
++ gtk_widget_set_hexpand (GTK_WIDGET (toplevel->priv->inner_frame), TRUE);
++ gtk_widget_set_vexpand (GTK_WIDGET (toplevel->priv->inner_frame), TRUE);
++
++ gtk_grid_attach (GTK_GRID (toplevel->priv->grid), GTK_WIDGET (toplevel->priv->inner_frame), 1, 1, 1, 1);
+ gtk_widget_show (GTK_WIDGET (toplevel->priv->inner_frame));
+
+ container = panel_widget_new (toplevel,
+@@ -4245,9 +4219,8 @@ panel_toplevel_setup_widgets (PanelToplevel *toplevel)
+ gtk_container_add (GTK_CONTAINER (toplevel->priv->inner_frame), container);
+ gtk_widget_show (container);
+
+- gtk_container_add (GTK_CONTAINER (toplevel), toplevel->priv->table);
+- gtk_widget_show (toplevel->priv->table);
+-
++ gtk_container_add (GTK_CONTAINER (toplevel), toplevel->priv->grid);
++ gtk_widget_show (toplevel->priv->grid);
+ }
+
+ static void
+@@ -4314,7 +4287,7 @@ panel_toplevel_init (PanelToplevel *toplevel)
+
+ toplevel->priv->panel_widget = NULL;
+ toplevel->priv->inner_frame = NULL;
+- toplevel->priv->table = NULL;
++ toplevel->priv->grid = NULL;
+ toplevel->priv->hide_button_top = NULL;
+ toplevel->priv->hide_button_bottom = NULL;
+ toplevel->priv->hide_button_left = NULL;
+diff --git a/gnome-panel/panel-util.c b/gnome-panel/panel-util.c
+index eb591c1..2ba8eba 100644
+--- gnome-panel/panel-util.c
++++ gnome-panel/panel-util.c
+@@ -37,7 +37,6 @@
+ #include "applet.h"
+ #include "xstuff.h"
+ #include "panel-bindings.h"
+-#include "panel-gconf.h"
+ #include "panel-globals.h"
+ #include "launcher.h"
+ #include "panel-icon-names.h"
+@@ -714,7 +713,6 @@ panel_util_get_file_display_name_if_mount (GFile *file)
+ return ret;
+ }
+
+-#define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
+ static char *
+ panel_util_get_file_display_for_common_files (GFile *file)
+ {
+@@ -722,18 +720,17 @@ panel_util_get_file_display_for_common_files (GFile *file)
+
+ compare = g_file_new_for_path (g_get_home_dir ());
+ if (g_file_equal (file, compare)) {
+- char *gconf_name;
++ GSettings *settings = g_settings_new (GNOME_NAUTILUS_DESKTOP_SCHEMA);
++ char *home_foler_name = g_settings_get_string (settings, GNOME_NAUTILUS_DESKTOP_HOME_ICON_NAME_KEY);
+
+ g_object_unref (compare);
++ g_object_unref (settings);
+
+- gconf_name = gconf_client_get_string (panel_gconf_get_client (),
+- HOME_NAME_KEY,
+- NULL);
+- if (PANEL_GLIB_STR_EMPTY (gconf_name)) {
+- g_free (gconf_name);
++ if (PANEL_GLIB_STR_EMPTY (home_foler_name)) {
++ g_free (home_foler_name);
+ return g_strdup (_("Home Folder"));
+ } else {
+- return gconf_name;
++ return home_foler_name;
+ }
+ }
+ g_object_unref (compare);
+diff --git a/gnome-panel/panel-widget.c b/gnome-panel/panel-widget.c
+index d8e10b5..c76b68a 100644
+--- gnome-panel/panel-widget.c
++++ gnome-panel/panel-widget.c
+@@ -1286,14 +1286,6 @@ panel_widget_size_request(GtkWidget *widget, GtkRequisition *requisition)
+ }
+ }
+
+-
+- if (!panel->packed) {
+- if (panel->orient == GTK_ORIENTATION_HORIZONTAL)
+- requisition->width = panel->size;
+- else
+- requisition->height = panel->size;
+- }
+-
+ dont_fill = panel->packed && panel->nb_applets_size_hints != 0;
+
+ if (panel->orient == GTK_ORIENTATION_HORIZONTAL) {
+@@ -1503,12 +1495,6 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
+ }
+ }
+
+-
+- if(panel->orient == GTK_ORIENTATION_HORIZONTAL)
+- panel->thick = allocation->height;
+- else
+- panel->thick = allocation->width;
+-
+ panel_widget_set_background_region (panel);
+ }
+
+@@ -1517,7 +1503,7 @@ panel_widget_is_cursor(PanelWidget *panel, int overlap)
+ {
+ GtkWidget *widget;
+ GtkAllocation allocation;
+- GdkModifierType modifier_mask;
++ GdkDevice *device;
+ int x,y;
+ int w,h;
+
+@@ -1530,7 +1516,8 @@ panel_widget_is_cursor(PanelWidget *panel, int overlap)
+ !gtk_widget_get_visible(widget))
+ return FALSE;
+
+- gdk_window_get_device_position(gtk_widget_get_window (widget), gtk_get_current_event_device (), &x, &y, &modifier_mask);
++ device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
++ gdk_window_get_device_position(gtk_widget_get_window (widget), device, &x, &y, NULL);
+
+ gtk_widget_get_allocation (widget, &allocation);
+ w = allocation.width;
+@@ -1702,8 +1689,7 @@ panel_widget_init (PanelWidget *panel)
+
+ panel->packed = FALSE;
+ panel->orient = GTK_ORIENTATION_HORIZONTAL;
+- panel->thick = PANEL_MINIMUM_WIDTH;
+- panel->size = G_MAXINT;
++ panel->size = 0;
+ panel->applet_list = NULL;
+ panel->drop_widget = widget;
+ panel->open_dialogs = NULL;
+@@ -1732,21 +1718,18 @@ panel_widget_new (PanelToplevel *toplevel,
+
+ panel = g_object_new (PANEL_TYPE_WIDGET, NULL);
+
+- gtk_widget_set_has_window (GTK_WIDGET (panel), TRUE);
+- gtk_widget_set_can_focus (GTK_WIDGET (panel), TRUE);
++ gtk_widget_set_has_window (GTK_WIDGET (panel), TRUE);
++ gtk_widget_set_can_focus (GTK_WIDGET (panel), TRUE);
+
+ panel->orient = orient;
+ panel->sz = sz;
+
+ panel->packed = packed;
+- if (packed)
+- panel->size = 0;
+- else
+- panel->size = G_MAXINT;
++ panel->size = 0;
+
+ panel->toplevel = toplevel;
+ panel->drop_widget = GTK_WIDGET (toplevel);
+-
++
+ return GTK_WIDGET (panel);
+ }
+
+@@ -1903,11 +1886,12 @@ panel_widget_get_cursorloc (PanelWidget *panel)
+ {
+ int x, y;
+ gboolean rtl;
+- GdkModifierType modifier_mask;
++ GdkDevice *device;
+
+ g_return_val_if_fail (PANEL_IS_WIDGET (panel), -1);
+
+- gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET (panel)), gtk_get_current_event_device (), &x, &y, &modifier_mask);
++ device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (GTK_WIDGET (panel))));
++ gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET (panel)), device, &x, &y, NULL);
+ rtl = gtk_widget_get_direction (GTK_WIDGET (panel)) == GTK_TEXT_DIR_RTL;
+
+ if (panel->orient == GTK_ORIENTATION_HORIZONTAL)
+@@ -2082,13 +2066,14 @@ move_timeout_handler(gpointer data)
+ if(panel->currently_dragged_applet && repeat_if_outside) {
+ GtkWidget *widget;
+ GtkAllocation allocation;
+- GdkModifierType modifier_mask;
++ GdkDevice *device;
+ int x,y;
+ int w,h;
+
+ widget = panel->currently_dragged_applet->applet;
+
+- gdk_window_get_device_position(gtk_widget_get_window (widget), gtk_get_current_event_device (), &x, &y, &modifier_mask);
++ device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
++ gdk_window_get_device_position(gtk_widget_get_window (widget), device, &x, &y, NULL);
+
+ gtk_widget_get_allocation (widget, &allocation);
+ w = allocation.width;
+diff --git a/gnome-panel/panel-widget.h b/gnome-panel/panel-widget.h
+index 81f6b56..a4df7ad 100644
+--- gnome-panel/panel-widget.h
++++ gnome-panel/panel-widget.h
+@@ -10,7 +10,6 @@
+ #ifndef PANEL_WIDGET_H
+ #define PANEL_WIDGET_H
+
+-
+ #include <gtk/gtk.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include "button-widget.h"
+@@ -25,8 +24,6 @@ G_BEGIN_DECLS
+ #define PANEL_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_WIDGET, PanelWidgetClass))
+ #define PANEL_IS_WIDGET(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANEL_TYPE_WIDGET))
+
+-#define PANEL_MINIMUM_WIDTH 12
+-
+ #define PANEL_APPLET_DATA "panel_applet_data"
+
+ #ifndef TYPEDEF_PANEL_WIDGET
+@@ -90,8 +87,6 @@ struct _PanelWidget
+ AppletData *currently_dragged_applet;
+ guint dragged_state;
+
+- int thick;
+-
+ PanelBackground background;
+
+ GtkWidget *drop_widget; /* widget that the panel checks for
+diff --git a/libpanel-applet/panel-applet-bindings.c b/libpanel-applet/panel-applet-bindings.c
+index 8f70392..078710f 100644
+--- libpanel-applet/panel-applet-bindings.c
++++ libpanel-applet/panel-applet-bindings.c
+@@ -126,12 +126,13 @@ panel_applet_bindings_get_real_modifier_mask (guint mask)
+ * adapted from panel-bindings.c *
+ \*********************************/
+
+-#define MOUSE_MODIFIER_DIR "/apps/metacity/general"
+-#define MOUSE_MODIFIER_KEY "/apps/metacity/general/mouse_button_modifier"
++#define GNOME_DESKTOP_WM_PREFERENCES_SCHEMA "org.gnome.desktop.wm.preferences"
++#define GNOME_DESKTOP_WM_PREFERENCES_MOUSE_BUTTON_MODIFIER_KEY "mouse-button-modifier"
++
+ #define DEFAULT_MOUSE_MODIFIER GDK_MOD1_MASK
+
+-static guint initialised = 0;
+-static guint notify_id = 0;
++static gboolean initialised = FALSE;
++static GSettings *preferences = NULL;
+
+ static guint mouse_button_modifier_keymask = DEFAULT_MOUSE_MODIFIER;
+
+@@ -155,83 +156,31 @@ panel_bindings_mouse_modifier_set_from_string (const char *str)
+ }
+
+ static void
+-panel_bindings_mouse_modifier_changed (GConfClient *client,
+- guint cnxn_id,
+- GConfEntry *entry,
+- gpointer user_data)
++panel_bindings_mouse_modifier_changed (GSettings *settings, const gchar *key)
+ {
+- GConfValue *value;
+- const char *str;
+-
+- value = gconf_entry_get_value (entry);
+-
+- if (!value || value->type != GCONF_VALUE_STRING)
+- return;
+-
+- str = gconf_value_get_string (value);
+- panel_bindings_mouse_modifier_set_from_string (str);
++ panel_bindings_mouse_modifier_set_from_string (g_settings_get_string (settings, key));
+ }
+
+-void
+-panel_applet_bindings_clean (GConfClient *client)
++static void
++panel_applet_bindings_init (void)
+ {
+- if (initialised == 0)
+- return;
++ char *str;
+
+- initialised--;
+-
+- if (initialised > 0)
++ if (initialised)
+ return;
+
+- gconf_client_remove_dir (client, MOUSE_MODIFIER_DIR, NULL);
+- if (notify_id > 0)
+- gconf_client_notify_remove (client, notify_id);
+- notify_id = 0;
+-}
+-
+-void
+-panel_applet_bindings_init (GConfClient *client)
+-{
+- GError *error;
+- char *str;
+-
+- if (initialised > 0) {
+- initialised++;
+- return;
+- }
++ preferences = g_settings_new (GNOME_DESKTOP_WM_PREFERENCES_SCHEMA);
+
+ /* mouse button modifier */
+- error = NULL;
+- gconf_client_add_dir (client, MOUSE_MODIFIER_DIR,
+- GCONF_CLIENT_PRELOAD_NONE, &error);
+- if (error) {
+- g_warning ("Error loading gconf directory '%s': %s",
+- MOUSE_MODIFIER_DIR, error->message),
+- g_error_free (error);
+- }
++ g_signal_connect (preferences, "changed::" GNOME_DESKTOP_WM_PREFERENCES_MOUSE_BUTTON_MODIFIER_KEY,
++ G_CALLBACK (panel_bindings_mouse_modifier_changed),
++ NULL);
+
+- error = NULL;
+- notify_id = gconf_client_notify_add (client, MOUSE_MODIFIER_KEY,
+- panel_bindings_mouse_modifier_changed,
+- NULL, NULL, &error);
+- if (error) {
+- g_warning ("Error watching gconf key '%s': %s",
+- MOUSE_MODIFIER_KEY, error->message);
+- g_error_free (error);
+- }
+-
+- error = NULL;
+- str = gconf_client_get_string (client, MOUSE_MODIFIER_KEY, &error);
+- if (error) {
+- g_warning ("Error getting value for '%s': %s",
+- MOUSE_MODIFIER_KEY, error->message);
+- g_error_free (error);
+- } else {
+- panel_bindings_mouse_modifier_set_from_string (str);
+- g_free (str);
+- }
++ str = g_settings_get_string (preferences, GNOME_DESKTOP_WM_PREFERENCES_MOUSE_BUTTON_MODIFIER_KEY);
++ panel_bindings_mouse_modifier_set_from_string (str);
++ g_free (str);
+
+- initialised = 1;
++ initialised = TRUE;
+ }
+
+ guint
+@@ -239,9 +188,11 @@ panel_applet_bindings_get_mouse_button_modifier_keymask (void)
+ {
+ guint mod;
+
+- g_assert (initialised != 0);
+ g_assert (mouse_button_modifier_keymask != 0);
+
++ if (!initialised)
++ panel_applet_bindings_init ();
++
+ mod = panel_applet_bindings_get_real_modifier_mask (mouse_button_modifier_keymask);
+
+ if (mod & gtk_accelerator_get_default_mod_mask ())
+diff --git a/libpanel-applet/panel-applet-bindings.h b/libpanel-applet/panel-applet-bindings.h
+index 79127e6..fd5611f 100644
+--- libpanel-applet/panel-applet-bindings.h
++++ libpanel-applet/panel-applet-bindings.h
+@@ -27,13 +27,9 @@
+
+ #include <glib.h>
+ #include <gdk/gdk.h>
+-#include <gconf/gconf-client.h>
+
+ G_BEGIN_DECLS
+
+-void panel_applet_bindings_init (GConfClient *client);
+-void panel_applet_bindings_clean (GConfClient *client);
+-
+ guint panel_applet_bindings_get_mouse_button_modifier_keymask (void);
+
+ void panel_applet_bindings_key_event_is_popup (GdkEventKey *event,
+diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
+index 78e2e83..cad7cbc 100644
+--- libpanel-applet/panel-applet.c
++++ libpanel-applet/panel-applet.c
+@@ -1062,8 +1062,6 @@ panel_applet_finalize (GObject *object)
+
+ panel_applet_set_preferences_key (applet, NULL);
+
+- panel_applet_bindings_clean (applet->priv->client);
+-
+ if (applet->priv->client)
+ g_object_unref (applet->priv->client);
+ applet->priv->client = NULL;
+@@ -1130,7 +1128,7 @@ panel_applet_position_menu (GtkMenu *menu,
+ PanelApplet *applet;
+ GtkAllocation allocation;
+ GtkRequisition requisition;
+- GdkModifierType modifier_mask;
++ GdkDevice *device;
+ GdkScreen *screen;
+ int menu_x = 0;
+ int menu_y = 0;
+@@ -1148,7 +1146,8 @@ panel_applet_position_menu (GtkMenu *menu,
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
+ gdk_window_get_origin (gtk_widget_get_window (widget),
+ &menu_x, &menu_y);
+- gdk_window_get_device_position(gtk_widget_get_window (widget), gtk_get_current_event_device (), &pointer_x, &pointer_y, &modifier_mask);
++ device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
++ gdk_window_get_device_position(gtk_widget_get_window (widget), device, &pointer_x, &pointer_y, NULL);
+
+ gtk_widget_get_allocation (widget, &allocation);
+
+@@ -1236,6 +1235,7 @@ panel_applet_edit_menu_popup (PanelApplet *applet,
+
+ menu = gtk_ui_manager_get_widget (applet->priv->ui_manager,
+ "/PanelAppletEditPopup");
++ gtk_menu_set_screen (GTK_MENU (menu), gtk_widget_get_screen (GTK_WIDGET (applet)));
+ gtk_menu_popup (GTK_MENU (menu),
+ NULL, NULL,
+ NULL,
+@@ -2061,10 +2061,6 @@ panel_applet_init (PanelApplet *applet)
+ gtk_ui_manager_add_ui_from_string (applet->priv->ui_manager,
+ panel_menu_ui, -1, NULL);
+
+-
+- panel_applet_bindings_init (applet->priv->client);
+-
+-
+ applet->priv->plug = gtk_plug_new (0);
+ g_signal_connect_swapped (G_OBJECT (applet->priv->plug), "embedded",
+ G_CALLBACK (panel_applet_setup),
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 9784acd..2a32822 100644
+--- po/POTFILES.in
++++ po/POTFILES.in
+@@ -23,7 +23,7 @@ applets/wncklet/window-menu.c
+ applets/wncklet/wncklet.c
+ applets/wncklet/workspace-switcher.c
+ [type: gettext/glade]applets/wncklet/workspace-switcher.ui
+-data/gnome-fallback.desktop.in.in
++data/gnome-flashback.desktop.in.in
+ data/gnome-flashback.session.desktop.in
+ data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
+ data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 06397e7..5cd9f64 100644
+--- po/POTFILES.skip
++++ po/POTFILES.skip
+@@ -4,7 +4,7 @@ applets/clock/GNOME_ClockApplet_Factory.server.in
+ applets/fish/GNOME_FishApplet_Factory.server.in
+ applets/notification_area/GNOME_NotificationAreaApplet.server.in
+ applets/wncklet/GNOME_Wncklet_Factory.server.in
+-data/gnome-fallback.desktop.in
++data/gnome-flashback.desktop.in
+ data/org.gnome.gnome-panel.applet.clock.gschema.xml.in
+ data/org.gnome.gnome-panel.applet.fish.gschema.xml.in
+ data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in
+diff --git a/po/cs.po b/po/cs.po
+index a4ad450..e8cbf36 100644
+--- po/cs.po
++++ po/cs.po
+@@ -18,8 +18,8 @@ msgstr ""
+ "Project-Id-Version: gnome-panel master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "panel&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-05-20 13:59+0000\n"
+-"PO-Revision-Date: 2013-05-23 20:35+0200\n"
++"POT-Creation-Date: 2013-12-07 13:14+0000\n"
++"PO-Revision-Date: 2013-12-07 18:43+0100\n"
+ "Last-Translator: Marek Černocký <marek@manet.cz>\n"
+ "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+ "Language: cs\n"
+@@ -68,7 +68,7 @@ msgstr "Úkoly"
+
+ #: ../applets/clock/calendar-window.c:831
+ #: ../applets/clock/calendar-window.c:1014
+-#: ../applets/clock/calendar-window.c:1552
++#: ../applets/clock/calendar-window.c:1550
+ msgid "Edit"
+ msgstr "Upravit"
+
+@@ -88,104 +88,104 @@ msgstr "Narozeniny a výročí"
+ msgid "Weather Information"
+ msgstr "Informace o počasí"
+
+-#: ../applets/clock/calendar-window.c:1552 ../applets/clock/clock.ui.h:22
++#: ../applets/clock/calendar-window.c:1550 ../applets/clock/clock.ui.h:22
+ msgid "Locations"
+ msgstr "Místa"
+
+-#: ../applets/clock/calendar-window.c:1807
++#: ../applets/clock/calendar-window.c:1805
+ msgid "Calendar"
+ msgstr "Kalendář"
+
+ #. Translators: This is a strftime format string.
+ #. * It is used to display a date. Please leave "%%s" as it is:
+ #. * it will be used to insert the timezone name later.
+-#: ../applets/clock/clock.c:309
++#: ../applets/clock/clock.c:297
+ msgid "%A %B %d (%%s)"
+ msgstr "%A, %e. %B (%%s)"
+
+-#: ../applets/clock/clock.c:321
++#: ../applets/clock/clock.c:309
+ msgid "Click to hide your appointments and tasks"
+ msgstr "Kliknutím se skryjí události a úkoly"
+
+-#: ../applets/clock/clock.c:324
++#: ../applets/clock/clock.c:312
+ msgid "Click to view your appointments and tasks"
+ msgstr "Kliknutím se zobrazí události a úkoly"
+
+-#: ../applets/clock/clock.c:328
++#: ../applets/clock/clock.c:316
+ msgid "Click to hide month calendar"
+ msgstr "Kliknutím se skryje měsíční kalendář"
+
+-#: ../applets/clock/clock.c:331
++#: ../applets/clock/clock.c:319
+ msgid "Click to view month calendar"
+ msgstr "Kliknutím se zobrazí měsíční kalendář"
+
+-#: ../applets/clock/clock.c:991
++#: ../applets/clock/clock.c:956
+ msgid "Computer Clock"
+ msgstr "Počítačové hodiny"
+
+-#: ../applets/clock/clock.c:1170
++#: ../applets/clock/clock.c:1120
+ msgid "Failed to open the time settings"
+ msgstr "Selhalo otevření nastavení času"
+
+-#: ../applets/clock/clock.c:1190 ../applets/fish/fish.c:1307
++#: ../applets/clock/clock.c:1140 ../applets/fish/fish.c:1307
+ #: ../applets/wncklet/window-list.c:155
+ #: ../applets/wncklet/workspace-switcher.c:218
+ msgid "_Preferences"
+ msgstr "Př_edvolby"
+
+-#: ../applets/clock/clock.c:1193
++#: ../applets/clock/clock.c:1143
+ msgid "Copy Date and _Time"
+ msgstr "Kopírova_t datum a čas"
+
+-#: ../applets/clock/clock.c:1196
++#: ../applets/clock/clock.c:1146
+ msgid "Ad_just Date & Time"
+ msgstr "_Upravit datum a čas"
+
+-#: ../applets/clock/clock.c:1767
++#: ../applets/clock/clock.c:1714
+ msgid "Choose Location"
+ msgstr "Vybrat místo"
+
+-#: ../applets/clock/clock.c:1846
++#: ../applets/clock/clock.c:1793
+ msgid "Edit Location"
+ msgstr "Upravit místo"
+
+-#: ../applets/clock/clock.c:1880
++#: ../applets/clock/clock.c:1827
+ msgid "Kelvin"
+ msgstr "Stupně Kelvina"
+
+-#: ../applets/clock/clock.c:1881
++#: ../applets/clock/clock.c:1828
+ msgid "Celsius"
+ msgstr "Stupně Celsia"
+
+-#: ../applets/clock/clock.c:1882
++#: ../applets/clock/clock.c:1829
+ msgid "Fahrenheit"
+ msgstr "Stupně Fahrenheita"
+
+-#: ../applets/clock/clock.c:1887
++#: ../applets/clock/clock.c:1834
+ msgid "Meters per second (m/s)"
+ msgstr "Metry za sekundu (m/s)"
+
+-#: ../applets/clock/clock.c:1888
++#: ../applets/clock/clock.c:1835
+ msgid "Kilometers per hour (kph)"
+ msgstr "Kilometry za hodinu (km/h)"
+
+-#: ../applets/clock/clock.c:1889
++#: ../applets/clock/clock.c:1836
+ msgid "Miles per hour (mph)"
+ msgstr "Míle za hodinu (mph)"
+
+-#: ../applets/clock/clock.c:1890
++#: ../applets/clock/clock.c:1837
+ msgid "Knots"
+ msgstr "Uzly"
+
+-#: ../applets/clock/clock.c:1891
++#: ../applets/clock/clock.c:1838
+ msgid "Beaufort scale"
+ msgstr "Beaufortova stupnice"
+
+-#: ../applets/clock/clock.c:1944
++#: ../applets/clock/clock.c:1891
+ msgid "City Name"
+ msgstr "Název města"
+
+-#: ../applets/clock/clock.c:1948
++#: ../applets/clock/clock.c:1895
+ msgid "City Time Zone"
+ msgstr "Časové pásmo města"
+
+@@ -363,12 +363,12 @@ msgstr "Počasí"
+ msgid "Time _Settings"
+ msgstr "Nas_tavení času"
+
+-#: ../applets/clock/clock-utils.c:97 ../applets/fish/fish.c:164
++#: ../applets/clock/clock-utils.c:96 ../applets/fish/fish.c:164
+ #, c-format
+ msgid "Could not display help document '%s'"
+ msgstr "Nelze zobrazit dokument nápovědy „%s“"
+
+-#: ../applets/clock/clock-utils.c:126 ../applets/fish/fish.c:190
++#: ../applets/clock/clock-utils.c:125 ../applets/fish/fish.c:190
+ msgid "Error displaying help document"
+ msgstr "Chyba při zobrazování dokumentu nápovědy"
+
+@@ -523,7 +523,7 @@ msgstr "Ryba"
+ msgid "Display a swimming fish or another animated creature"
+ msgstr "Zobrazit plavající rybu nebo jinou animovanou potvoru"
+
+-#: ../applets/notification_area/main.c:245
++#: ../applets/notification_area/main.c:244
+ msgid "Panel Notification Area"
+ msgstr "Oznamovací oblast na panelu"
+
+@@ -658,13 +658,13 @@ msgid "Restore to na_tive workspace"
+ msgstr "Obnovovat na _původní pracovní plochu"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ #: ../applets/wncklet/workspace-switcher.ui.h:4
+ msgid "rows"
+ msgstr "řádcích"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ msgid "columns"
+ msgstr "sloupců"
+
+@@ -704,15 +704,30 @@ msgstr "Z_obrazovat názvy pracovních ploch v přepínači"
+ msgid "Workspaces"
+ msgstr "Pracovní plochy"
+
+-#: ../data/gnome-flashback.desktop.in.h:1
+-#: ../data/gnome-flashback.session.desktop.in.h:1
+-msgid "GNOME Flashback"
+-msgstr "GNOME tradiční"
++#: ../data/gnome-flashback-compiz.desktop.in.in.h:1
++#: ../data/gnome-flashback-compiz.session.desktop.in.h:1
++#| msgid "GNOME Flashback"
++msgid "GNOME Flashback (Compiz)"
++msgstr "GNOME historické (Compiz)"
+
+-#: ../data/gnome-flashback.desktop.in.h:2
++#: ../data/gnome-flashback-compiz.desktop.in.in.h:2
++#: ../data/gnome-flashback.desktop.in.in.h:2
++#: ../data/gnome-flashback-mutter.desktop.in.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Toto sezení vás přihlásí do GNOME s tradičním panelem"
+
++#: ../data/gnome-flashback.desktop.in.in.h:1
++#: ../data/gnome-flashback.session.desktop.in.h:1
++#| msgid "GNOME Flashback"
++msgid "GNOME Flashback (Metacity)"
++msgstr "GNOME historické (Metacity)"
++
++#: ../data/gnome-flashback-mutter.desktop.in.in.h:1
++#: ../data/gnome-flashback-mutter.session.desktop.in.h:1
++#| msgid "GNOME Flashback"
++msgid "GNOME Flashback (Mutter)"
++msgstr "GNOME historické (Mutter)"
++
+ #: ../data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in.h:1
+ msgid "Show date in tooltip"
+ msgstr "Zobrazovat datum v místní nápovědě"
+@@ -1517,29 +1532,29 @@ msgstr "_Přesunout"
+ msgid "_Remove From Panel"
+ msgstr "_Odstranit z panelu"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:29
++#: ../gnome-panel/gnome-desktop-item-edit.c:27
+ msgid "Create new file in the given directory"
+ msgstr "Vytvořit nový soubor v daném adresáři"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:30
++#: ../gnome-panel/gnome-desktop-item-edit.c:28
+ msgid "[FILE...]"
+ msgstr "[SOUBOR…]"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:108
++#: ../gnome-panel/gnome-desktop-item-edit.c:106
+ msgid "- Edit .desktop files"
+ msgstr "- Upravit soubory. desktop"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:146
+-#: ../gnome-panel/gnome-desktop-item-edit.c:200 ../gnome-panel/launcher.c:892
++#: ../gnome-panel/gnome-desktop-item-edit.c:144
++#: ../gnome-panel/gnome-desktop-item-edit.c:198 ../gnome-panel/launcher.c:894
+ msgid "Create Launcher"
+ msgstr "Vytvořit spouštěč"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:171
+-#: ../gnome-panel/gnome-desktop-item-edit.c:194
++#: ../gnome-panel/gnome-desktop-item-edit.c:169
++#: ../gnome-panel/gnome-desktop-item-edit.c:192
+ msgid "Directory Properties"
+ msgstr "Vlastnosti adresáře"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:177 ../gnome-panel/launcher.c:732
++#: ../gnome-panel/gnome-desktop-item-edit.c:175 ../gnome-panel/launcher.c:732
+ msgid "Launcher Properties"
+ msgstr "Vlastnosti spouštěče"
+
+@@ -1582,23 +1597,23 @@ msgstr "Pro soubor desktop spouštěče na panelu nebylo poskytnuto URI\n"
+ msgid "Unable to open desktop file %s for panel launcher%s%s\n"
+ msgstr "Nelze otevřít soubor desktop %s pro spouštěč na panelu %s%s\n"
+
+-#: ../gnome-panel/launcher.c:796
++#: ../gnome-panel/launcher.c:798
+ msgid "_Launch"
+ msgstr "_Spustit"
+
+-#: ../gnome-panel/launcher.c:802 ../gnome-panel/panel-action-button.c:139
++#: ../gnome-panel/launcher.c:804 ../gnome-panel/panel-action-button.c:172
+ #: ../gnome-panel/panel-context-menu.c:133
+ msgid "_Properties"
+ msgstr "_Vlastnosti"
+
+-#: ../gnome-panel/launcher.c:833
++#: ../gnome-panel/launcher.c:835
+ #, c-format
+ msgid "Launcher location is not set, cannot load launcher\n"
+ msgstr "Není uvedeno umístění spouštěče, spouštěč nelze načíst\n"
+
+-#: ../gnome-panel/launcher.c:963 ../gnome-panel/panel-ditem-editor.c:1352
+-#: ../gnome-panel/panel-ditem-editor.c:1386
+-#: ../gnome-panel/panel-ditem-editor.c:1417
++#: ../gnome-panel/launcher.c:965 ../gnome-panel/panel-ditem-editor.c:1317
++#: ../gnome-panel/panel-ditem-editor.c:1351
++#: ../gnome-panel/panel-ditem-editor.c:1382
+ msgid "Could not save launcher"
+ msgstr "Nelze uložit spouštěč"
+
+@@ -1698,81 +1713,81 @@ msgstr "Není nainstalována žádná aplikace určená k obsluze složek hledá
+ msgid "Replace a currently running panel"
+ msgstr "Nahradit právě spuštěný panel"
+
+-#: ../gnome-panel/panel-action-button.c:127
++#: ../gnome-panel/panel-action-button.c:160
+ msgid "_Lock Screen"
+ msgstr "_Zamknout obrazovku"
+
+-#: ../gnome-panel/panel-action-button.c:133
++#: ../gnome-panel/panel-action-button.c:166
+ msgid "_Activate Screensaver"
+ msgstr "_Aktivovat šetřič obrazovky"
+
+-#: ../gnome-panel/panel-action-button.c:239
++#: ../gnome-panel/panel-action-button.c:272
+ msgid "Connect to server"
+ msgstr "Připojit se k serveru"
+
+-#: ../gnome-panel/panel-action-button.c:263
++#: ../gnome-panel/panel-action-button.c:296
+ msgid "Could not connect to server"
+ msgstr "Nelze se připojit k serveru"
+
+-#: ../gnome-panel/panel-action-button.c:293
++#: ../gnome-panel/panel-action-button.c:326
+ msgid "Lock Screen"
+ msgstr "Zamknout obrazovku"
+
+-#: ../gnome-panel/panel-action-button.c:294
++#: ../gnome-panel/panel-action-button.c:327
+ msgid "Protect your computer from unauthorized use"
+ msgstr "Chrání váš počítač před neautorizovaným použitím"
+
+ #. when changing one of those two strings, don't forget to
+ #. * update the ones in panel-menu-items.c (look for
+ #. * "1" (msgctxt: "panel:showusername"))
+-#: ../gnome-panel/panel-action-button.c:307
++#: ../gnome-panel/panel-action-button.c:340
+ msgid "Log Out"
+ msgstr "Odhlásit se"
+
+-#: ../gnome-panel/panel-action-button.c:308
++#: ../gnome-panel/panel-action-button.c:341
+ msgid "Log out of this session to log in as a different user"
+ msgstr ""
+ "Odhlásí se z tohoto sezení, aby bylo možné přihlásit se jako jiný uživatel"
+
+-#: ../gnome-panel/panel-action-button.c:316
++#: ../gnome-panel/panel-action-button.c:349
+ msgid "Run Application..."
+ msgstr "Spustit aplikaci…"
+
+-#: ../gnome-panel/panel-action-button.c:317
++#: ../gnome-panel/panel-action-button.c:350
+ msgid "Run an application by typing a command or choosing from a list"
+ msgstr "Spustí aplikaci zadáním příkazu nebo vybráním ze seznamu"
+
+-#: ../gnome-panel/panel-action-button.c:325
++#: ../gnome-panel/panel-action-button.c:358
+ msgid "Search for Files..."
+ msgstr "Hledat soubory…"
+
+-#: ../gnome-panel/panel-action-button.c:326
++#: ../gnome-panel/panel-action-button.c:359
+ msgid "Locate documents and folders on this computer by name or content"
+ msgstr "Hledá dokumenty a složky v tomto počítači podle názvu či obsahu"
+
+-#: ../gnome-panel/panel-action-button.c:333
+-#: ../gnome-panel/panel-force-quit.c:239
++#: ../gnome-panel/panel-action-button.c:366
++#: ../gnome-panel/panel-force-quit.c:241
+ msgid "Force Quit"
+ msgstr "Vynutit ukončení"
+
+-#: ../gnome-panel/panel-action-button.c:334
++#: ../gnome-panel/panel-action-button.c:367
+ msgid "Force a misbehaving application to quit"
+ msgstr "Vynutí ukončení chybně se chovající aplikace"
+
+ #. FIXME icon
+-#: ../gnome-panel/panel-action-button.c:342
++#: ../gnome-panel/panel-action-button.c:375
+ msgid "Connect to Server..."
+ msgstr "Připojit se k serveru…"
+
+-#: ../gnome-panel/panel-action-button.c:343
++#: ../gnome-panel/panel-action-button.c:376
+ msgid "Connect to a remote computer or shared disk"
+ msgstr "Připojit se ke vzdálenému počítači nebo sdílenému disku"
+
+-#: ../gnome-panel/panel-action-button.c:350
++#: ../gnome-panel/panel-action-button.c:383
+ msgid "Power Off"
+ msgstr "Vypnout"
+
+-#: ../gnome-panel/panel-action-button.c:351
++#: ../gnome-panel/panel-action-button.c:384
+ msgid "Power off the computer"
+ msgstr "Vypne počítač"
+
+@@ -1879,7 +1894,7 @@ msgid "Open URL: %s"
+ msgstr "Otevřít URL: %s"
+
+ #. Translators: %s is a URI
+-#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:645
++#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:640
+ #, c-format
+ msgid "Open '%s'"
+ msgstr "Otevře „%s“"
+@@ -1887,18 +1902,18 @@ msgstr "Otevře „%s“"
+ #. is_exec?
+ #. exec
+ #. name
+-#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1200
++#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1194
+ msgid "Open your personal folder"
+ msgstr "Otevře osobní složku"
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1236
++#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1223
+ msgid "Computer"
+ msgstr "Počítač"
+
+ #. name
+-#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1242
++#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1224
+ msgid ""
+ "Browse all local and remote disks and folders accessible from this computer"
+ msgstr ""
+@@ -1907,12 +1922,12 @@ msgstr ""
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1252
++#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1233
+ msgid "Network"
+ msgstr "Síť"
+
+ #. name
+-#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1253
++#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1234
+ msgid "Browse bookmarked and local network locations"
+ msgstr "Procházet poznačená a místní síťová umístění"
+
+@@ -1961,72 +1976,72 @@ msgid "Location"
+ msgstr "Umístění"
+
+ #. Type
+-#: ../gnome-panel/panel-ditem-editor.c:616
++#: ../gnome-panel/panel-ditem-editor.c:602
+ msgid "_Type:"
+ msgstr "_Typ:"
+
+ #. Name
+-#: ../gnome-panel/panel-ditem-editor.c:623
++#: ../gnome-panel/panel-ditem-editor.c:609
+ msgid "_Name:"
+ msgstr "Náz_ev:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:650
++#: ../gnome-panel/panel-ditem-editor.c:634
+ msgid "_Browse..."
+ msgstr "_Procházet…"
+
+ #. Comment
+-#: ../gnome-panel/panel-ditem-editor.c:657
++#: ../gnome-panel/panel-ditem-editor.c:641
+ msgid "Co_mment:"
+ msgstr "Ko_mentář:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1003
++#: ../gnome-panel/panel-ditem-editor.c:968
+ msgid "Choose an application..."
+ msgstr "Zvolit aplikaci…"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1007
++#: ../gnome-panel/panel-ditem-editor.c:972
+ msgid "Choose a file..."
+ msgstr "Zvolit soubor…"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1172
+-#: ../gnome-panel/panel-ditem-editor.c:1181
++#: ../gnome-panel/panel-ditem-editor.c:1137
++#: ../gnome-panel/panel-ditem-editor.c:1146
+ msgid "Comm_and:"
+ msgstr "Pří_kaz:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1190
++#: ../gnome-panel/panel-ditem-editor.c:1155
+ msgid "_Location:"
+ msgstr "_Umístění:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1353
++#: ../gnome-panel/panel-ditem-editor.c:1318
+ msgid "The name of the launcher is not set."
+ msgstr "Název spouštěče není nastaven."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1357
++#: ../gnome-panel/panel-ditem-editor.c:1322
+ msgid "Could not save directory properties"
+ msgstr "Nelze uložit nastavení adresáře"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1358
++#: ../gnome-panel/panel-ditem-editor.c:1323
+ msgid "The name of the directory is not set."
+ msgstr "Název adresáře není nastaven."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1374
++#: ../gnome-panel/panel-ditem-editor.c:1339
+ msgid "The command of the launcher is not set."
+ msgstr "Příkaz spouštěče není nastaven."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1377
++#: ../gnome-panel/panel-ditem-editor.c:1342
+ msgid "The location of the launcher is not set."
+ msgstr "Umístění spouštěče není nastaveno."
+
+-#: ../gnome-panel/panel-force-quit.c:77
++#: ../gnome-panel/panel-force-quit.c:79
+ msgid ""
+ "Click on a window to force the application to quit. To cancel press <ESC>."
+ msgstr ""
+ "Kliknutím na okno vynutíte ukončení aplikace. Ke zrušení stiskněte <ESC>."
+
+-#: ../gnome-panel/panel-force-quit.c:222
++#: ../gnome-panel/panel-force-quit.c:224
+ msgid "Force this application to exit?"
+ msgstr "Vynutit ukončení této aplikace?"
+
+-#: ../gnome-panel/panel-force-quit.c:225
++#: ../gnome-panel/panel-force-quit.c:227
+ msgid ""
+ "If you choose to force an application to exit, unsaved changes in any open "
+ "documents in it might get lost."
+@@ -2034,7 +2049,7 @@ msgstr ""
+ "Vynutíte-li ukončení aplikace, neuložené změny ve všech otevřených "
+ "dokumentech mohou být ztraceny."
+
+-#: ../gnome-panel/panel-layout.c:1197 ../gnome-panel/panel-layout.c:1211
++#: ../gnome-panel/panel-layout.c:1219 ../gnome-panel/panel-layout.c:1233
+ #, c-format
+ msgid "Cannot create initial panel layout.\n"
+ msgstr "Nelze vytvořit počáteční rozložení panelu.\n"
+@@ -2055,63 +2070,63 @@ msgstr "Aplikace"
+ msgid "_Edit Menus"
+ msgstr "_Upravit nabídky"
+
+-#: ../gnome-panel/panel-menu-items.c:491
++#: ../gnome-panel/panel-menu-items.c:486
+ msgid "Switch User"
+ msgstr "Přepnout uživatele"
+
+-#: ../gnome-panel/panel-menu-items.c:621
++#: ../gnome-panel/panel-menu-items.c:616
+ msgid "Bookmarks"
+ msgstr "Záložky"
+
+-#: ../gnome-panel/panel-menu-items.c:716
++#: ../gnome-panel/panel-menu-items.c:711
+ #, c-format
+ msgid "Unable to scan %s for media changes"
+ msgstr "%s nelze prohledat na změny médií"
+
+-#: ../gnome-panel/panel-menu-items.c:758
++#: ../gnome-panel/panel-menu-items.c:753
+ #, c-format
+ msgid "Rescan %s"
+ msgstr "Znovu prohledat %s"
+
+-#: ../gnome-panel/panel-menu-items.c:795
++#: ../gnome-panel/panel-menu-items.c:790
+ #, c-format
+ msgid "Unable to mount %s"
+ msgstr "Nelze připojit %s"
+
+-#: ../gnome-panel/panel-menu-items.c:857
++#: ../gnome-panel/panel-menu-items.c:852
+ #, c-format
+ msgid "Mount %s"
+ msgstr "Připojit %s"
+
+-#: ../gnome-panel/panel-menu-items.c:1065
++#: ../gnome-panel/panel-menu-items.c:1060
+ msgid "Removable Media"
+ msgstr "Výměnná média"
+
+-#: ../gnome-panel/panel-menu-items.c:1156
++#: ../gnome-panel/panel-menu-items.c:1151
+ msgid "Network Places"
+ msgstr "Místa v síti"
+
+ #. Translators: Desktop is used here as in
+ #. * "Desktop Folder" (this is not the Desktop
+ #. * environment).
+-#: ../gnome-panel/panel-menu-items.c:1220
++#: ../gnome-panel/panel-menu-items.c:1211
+ msgctxt "Desktop Folder"
+ msgid "Desktop"
+ msgstr "Pracovní plocha"
+
+-#: ../gnome-panel/panel-menu-items.c:1221
++#: ../gnome-panel/panel-menu-items.c:1212
+ msgid "Open the contents of your desktop in a folder"
+ msgstr "Otevře obsah pracovní plochy ve složce"
+
+-#: ../gnome-panel/panel-menu-items.c:1358
++#: ../gnome-panel/panel-menu-items.c:1336
+ msgid "Available"
+ msgstr "Přítomen"
+
+-#: ../gnome-panel/panel-menu-items.c:1368
++#: ../gnome-panel/panel-menu-items.c:1346
+ msgid "Busy"
+ msgstr "Zaneprázdněn"
+
+-#: ../gnome-panel/panel-menu-items.c:1621
++#: ../gnome-panel/panel-menu-items.c:1578
+ msgid "Places"
+ msgstr "Místa"
+
+@@ -2454,90 +2469,90 @@ msgstr "Skrýt panel"
+
+ #. translators: these string will be shown in MetaCity's switch window
+ #. * popup when you pass the focus to a panel
+-#: ../gnome-panel/panel-toplevel.c:1657
++#: ../gnome-panel/panel-toplevel.c:1648
+ msgid "Top Expanded Edge Panel"
+ msgstr "Rozpínací hranový panel nahoře"
+
+-#: ../gnome-panel/panel-toplevel.c:1658
++#: ../gnome-panel/panel-toplevel.c:1649
+ msgid "Top Centered Panel"
+ msgstr "Panel nahoře uprostřed"
+
+-#: ../gnome-panel/panel-toplevel.c:1659
++#: ../gnome-panel/panel-toplevel.c:1650
+ msgid "Top Floating Panel"
+ msgstr "Plovoucí panel nahoře"
+
+-#: ../gnome-panel/panel-toplevel.c:1660
++#: ../gnome-panel/panel-toplevel.c:1651
+ msgid "Top Edge Panel"
+ msgstr "Hranový panel nahoře"
+
+-#: ../gnome-panel/panel-toplevel.c:1664
++#: ../gnome-panel/panel-toplevel.c:1655
+ msgid "Bottom Expanded Edge Panel"
+ msgstr "Rozpínací hranový panel dole"
+
+-#: ../gnome-panel/panel-toplevel.c:1665
++#: ../gnome-panel/panel-toplevel.c:1656
+ msgid "Bottom Centered Panel"
+ msgstr "Panel dole uprostřed"
+
+-#: ../gnome-panel/panel-toplevel.c:1666
++#: ../gnome-panel/panel-toplevel.c:1657
+ msgid "Bottom Floating Panel"
+ msgstr "Plovoucí panel dole"
+
+-#: ../gnome-panel/panel-toplevel.c:1667
++#: ../gnome-panel/panel-toplevel.c:1658
+ msgid "Bottom Edge Panel"
+ msgstr "Hranový panel dole"
+
+-#: ../gnome-panel/panel-toplevel.c:1671
++#: ../gnome-panel/panel-toplevel.c:1662
+ msgid "Left Expanded Edge Panel"
+ msgstr "Rozpínací hranový panel vlevo"
+
+-#: ../gnome-panel/panel-toplevel.c:1672
++#: ../gnome-panel/panel-toplevel.c:1663
+ msgid "Left Centered Panel"
+ msgstr "Panel vlevo uprostřed"
+
+-#: ../gnome-panel/panel-toplevel.c:1673
++#: ../gnome-panel/panel-toplevel.c:1664
+ msgid "Left Floating Panel"
+ msgstr "Plovoucí panel vlevo"
+
+-#: ../gnome-panel/panel-toplevel.c:1674
++#: ../gnome-panel/panel-toplevel.c:1665
+ msgid "Left Edge Panel"
+ msgstr "Hranový panel vlevo"
+
+-#: ../gnome-panel/panel-toplevel.c:1678
++#: ../gnome-panel/panel-toplevel.c:1669
+ msgid "Right Expanded Edge Panel"
+ msgstr "Rozpínací hranový panel vpravo"
+
+-#: ../gnome-panel/panel-toplevel.c:1679
++#: ../gnome-panel/panel-toplevel.c:1670
+ msgid "Right Centered Panel"
+ msgstr "Panel vpravo uprostřed"
+
+-#: ../gnome-panel/panel-toplevel.c:1680
++#: ../gnome-panel/panel-toplevel.c:1671
+ msgid "Right Floating Panel"
+ msgstr "Plovoucí panel vpravo"
+
+-#: ../gnome-panel/panel-toplevel.c:1681
++#: ../gnome-panel/panel-toplevel.c:1672
+ msgid "Right Edge Panel"
+ msgstr "Hranový panel vpravo"
+
+-#: ../gnome-panel/panel-util.c:314
++#: ../gnome-panel/panel-util.c:313
+ #, c-format
+ msgid "Icon '%s' not found"
+ msgstr "Ikona „%s“ nenalezena"
+
+-#: ../gnome-panel/panel-util.c:557
++#: ../gnome-panel/panel-util.c:556
+ msgid "file"
+ msgstr "soubor"
+
+-#: ../gnome-panel/panel-util.c:734
++#: ../gnome-panel/panel-util.c:731
+ msgid "Home Folder"
+ msgstr "Domovská složka"
+
+ #. Translators: this is the same string as the one found in
+ #. * nautilus
+-#: ../gnome-panel/panel-util.c:746
++#: ../gnome-panel/panel-util.c:743
+ msgid "File System"
+ msgstr "Systém souborů"
+
+-#: ../gnome-panel/panel-util.c:919
++#: ../gnome-panel/panel-util.c:916
+ msgid "Search"
+ msgstr "Hledat"
+
+@@ -2546,7 +2561,7 @@ msgstr "Hledat"
+ #. * example, "Trash: some-directory". It means that the
+ #. * directory called "some-directory" is in the trash.
+ #.
+-#: ../gnome-panel/panel-util.c:965
++#: ../gnome-panel/panel-util.c:962
+ #, c-format
+ msgid "%1$s: %2$s"
+ msgstr "%1$s: %2$s"
+diff --git a/po/da.po b/po/da.po
+index ea802ac..6068578 100644
+--- po/da.po
++++ po/da.po
+@@ -716,12 +716,12 @@ msgstr "Vis arbejdsområde_navne i skifteren"
+ msgid "Workspaces"
+ msgstr "Arbejdsområder"
+
+-#: ../data/gnome-fallback.desktop.in.h:1
++#: ../data/gnome-flashback.desktop.in.h:1
+ #: ../data/gnome-flashback.session.desktop.in.h:1
+ msgid "GNOME Flashback"
+ msgstr "GNOME-flashback"
+
+-#: ../data/gnome-fallback.desktop.in.h:2
++#: ../data/gnome-flashback.desktop.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Denne session logger dig ind i GNOME med det traditionelle panel"
+
+diff --git a/po/de.po b/po/de.po
+index e0c3c6c..ee45f9b 100644
+--- po/de.po
++++ po/de.po
+@@ -714,12 +714,12 @@ msgstr "_Namen der Arbeitsflächen im Umschalter anzeigen"
+ msgid "Workspaces"
+ msgstr "Arbeitsflächen"
+
+-#: ../data/gnome-fallback.desktop.in.h:1
++#: ../data/gnome-flashback.desktop.in.h:1
+ #: ../data/gnome-flashback.session.desktop.in.h:1
+ msgid "GNOME Flashback"
+ msgstr "GNOME Flashback"
+
+-#: ../data/gnome-fallback.desktop.in.h:2
++#: ../data/gnome-flashback.desktop.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Diese Sitzung meldet Sie bei GNOME an mit dem traditionellen Panel"
+
+diff --git a/po/es.po b/po/es.po
+index c0eb168..934a901 100644
+--- po/es.po
++++ po/es.po
+@@ -22,8 +22,8 @@ msgstr ""
+ "Project-Id-Version: gnome-panel.master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "panel&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-05-20 13:59+0000\n"
+-"PO-Revision-Date: 2013-05-22 12:13+0200\n"
++"POT-Creation-Date: 2013-12-10 17:27+0000\n"
++"PO-Revision-Date: 2013-12-12 11:25+0100\n"
+ "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+ "Language-Team: Español <gnome-es-list@gnome.org>\n"
+ "Language: \n"
+@@ -72,7 +72,7 @@ msgstr "Tareas"
+
+ #: ../applets/clock/calendar-window.c:831
+ #: ../applets/clock/calendar-window.c:1014
+-#: ../applets/clock/calendar-window.c:1552
++#: ../applets/clock/calendar-window.c:1550
+ msgid "Edit"
+ msgstr "Editar"
+
+@@ -92,105 +92,105 @@ msgstr "Cumpleaños y aniversarios"
+ msgid "Weather Information"
+ msgstr "Información meteorológica"
+
+-#: ../applets/clock/calendar-window.c:1552 ../applets/clock/clock.ui.h:22
++#: ../applets/clock/calendar-window.c:1550 ../applets/clock/clock.ui.h:22
+ msgid "Locations"
+ msgstr "Ubicaciones"
+
+-#: ../applets/clock/calendar-window.c:1807
++#: ../applets/clock/calendar-window.c:1805
+ msgid "Calendar"
+ msgstr "Calendario"
+
+ #. Translators: This is a strftime format string.
+ #. * It is used to display a date. Please leave "%%s" as it is:
+ #. * it will be used to insert the timezone name later.
+-#: ../applets/clock/clock.c:309
++#: ../applets/clock/clock.c:297
+ msgid "%A %B %d (%%s)"
+ msgstr "%A %d de %B (%%s)"
+
+-#: ../applets/clock/clock.c:321
++#: ../applets/clock/clock.c:309
+ msgid "Click to hide your appointments and tasks"
+ msgstr "Pulse para ocultar sus citas y tareas"
+
+-#: ../applets/clock/clock.c:324
++#: ../applets/clock/clock.c:312
+ msgid "Click to view your appointments and tasks"
+ msgstr "Pulse para ver sus citas y tareas"
+
+-#: ../applets/clock/clock.c:328
++#: ../applets/clock/clock.c:316
+ msgid "Click to hide month calendar"
+ msgstr "Pulse para ocultar el calendario del mes"
+
+-#: ../applets/clock/clock.c:331
++#: ../applets/clock/clock.c:319
+ msgid "Click to view month calendar"
+ msgstr "Pulse para ver el calendario del mes"
+
+-#: ../applets/clock/clock.c:991
++#: ../applets/clock/clock.c:956
+ msgid "Computer Clock"
+ msgstr "Reloj del equipo"
+
+-#: ../applets/clock/clock.c:1170
++#: ../applets/clock/clock.c:1120
+ msgid "Failed to open the time settings"
+ msgstr "Falló al abrir la configuración de la hora"
+
+-#: ../applets/clock/clock.c:1190 ../applets/fish/fish.c:1307
++#: ../applets/clock/clock.c:1140 ../applets/fish/fish.c:1307
+ #: ../applets/wncklet/window-list.c:155
+ #: ../applets/wncklet/workspace-switcher.c:218
+ msgid "_Preferences"
+ msgstr "Prefere_ncias"
+
+-#: ../applets/clock/clock.c:1193
++#: ../applets/clock/clock.c:1143
+ msgid "Copy Date and _Time"
+ msgstr "Copiar la fecha y la _hora"
+
+-#: ../applets/clock/clock.c:1196
++#: ../applets/clock/clock.c:1146
+ msgid "Ad_just Date & Time"
+ msgstr "A_justar fecha y hora"
+
+-#: ../applets/clock/clock.c:1767
++#: ../applets/clock/clock.c:1714
+ msgid "Choose Location"
+ msgstr "Elegir ubicación"
+
+-#: ../applets/clock/clock.c:1846
++#: ../applets/clock/clock.c:1793
+ msgid "Edit Location"
+ msgstr "Editar ubicación"
+
+-#: ../applets/clock/clock.c:1880
++#: ../applets/clock/clock.c:1827
+ msgid "Kelvin"
+ msgstr "Kelvin"
+
+-#: ../applets/clock/clock.c:1881
++#: ../applets/clock/clock.c:1828
+ msgid "Celsius"
+ msgstr "Centígrados"
+
+-#: ../applets/clock/clock.c:1882
++#: ../applets/clock/clock.c:1829
+ msgid "Fahrenheit"
+ msgstr "Fahrenheit"
+
+-#: ../applets/clock/clock.c:1887
++#: ../applets/clock/clock.c:1834
+ msgid "Meters per second (m/s)"
+ msgstr "Metros por segundo (m/s)"
+
+-#: ../applets/clock/clock.c:1888
++#: ../applets/clock/clock.c:1835
+ msgid "Kilometers per hour (kph)"
+ msgstr "Kilómetros por hora (km/h)"
+
+-#: ../applets/clock/clock.c:1889
++#: ../applets/clock/clock.c:1836
+ msgid "Miles per hour (mph)"
+ msgstr "Millas por hora (mph)"
+
+-#: ../applets/clock/clock.c:1890
++#: ../applets/clock/clock.c:1837
+ msgid "Knots"
+ msgstr "Nudos"
+
+-#: ../applets/clock/clock.c:1891
++#: ../applets/clock/clock.c:1838
+ msgid "Beaufort scale"
+ msgstr "Escala Beaufort"
+
+ # Esta cadena aparece en la ayuda
+-#: ../applets/clock/clock.c:1944
++#: ../applets/clock/clock.c:1891
+ msgid "City Name"
+ msgstr "Nombre de la ciudad"
+
+-#: ../applets/clock/clock.c:1948
++#: ../applets/clock/clock.c:1895
+ msgid "City Time Zone"
+ msgstr "Zona horaria de la ciudad"
+
+@@ -368,12 +368,12 @@ msgstr "Meteorología"
+ msgid "Time _Settings"
+ msgstr "Ajuste_s de la hora"
+
+-#: ../applets/clock/clock-utils.c:97 ../applets/fish/fish.c:164
++#: ../applets/clock/clock-utils.c:96 ../applets/fish/fish.c:164
+ #, c-format
+ msgid "Could not display help document '%s'"
+ msgstr "No se pudo mostrar el documento de ayuda «%s»"
+
+-#: ../applets/clock/clock-utils.c:126 ../applets/fish/fish.c:190
++#: ../applets/clock/clock-utils.c:125 ../applets/fish/fish.c:190
+ msgid "Error displaying help document"
+ msgstr "Error al mostrar el documento de ayuda"
+
+@@ -532,7 +532,7 @@ msgstr "Pez"
+ msgid "Display a swimming fish or another animated creature"
+ msgstr "Muestra un pez nadando u otra criatura animada"
+
+-#: ../applets/notification_area/main.c:245
++#: ../applets/notification_area/main.c:244
+ msgid "Panel Notification Area"
+ msgstr "Área del panel de notificación"
+
+@@ -667,13 +667,13 @@ msgid "Restore to na_tive workspace"
+ msgstr "Restaurar al área de trabajo na_tiva"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ #: ../applets/wncklet/workspace-switcher.ui.h:4
+ msgid "rows"
+ msgstr "filas"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ msgid "columns"
+ msgstr "columnas"
+
+@@ -713,12 +713,13 @@ msgstr "Mostrar los _nombres de las áreas de trabajo en el selector"
+ msgid "Workspaces"
+ msgstr "Áreas de trabajo"
+
+-#: ../data/gnome-flashback.desktop.in.h:1
++#: ../data/gnome-flashback.desktop.in.in.h:1
+ #: ../data/gnome-flashback.session.desktop.in.h:1
+-msgid "GNOME Flashback"
+-msgstr "GNOME Flashback"
++#| msgid "GNOME Flashback"
++msgid "GNOME Flashback (Metacity)"
++msgstr "GNOME Flashback (Metacity)"
+
+-#: ../data/gnome-flashback.desktop.in.h:2
++#: ../data/gnome-flashback.desktop.in.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Esto inicia sesión en GNOME con el panel tradicional"
+
+@@ -962,8 +963,8 @@ msgid ""
+ "for the whole desktop with the gtk-enable-tooltips property in GTK+."
+ msgstr ""
+ "Si está activada, se muestran las sugerencias en los objetos de los paneles. "
+-"Los consejos se pueden desactivar en todo el escritorio con la propiedad «gtk-"
+-"enable-tooltips» de GTK+."
++"Los consejos se pueden desactivar en todo el escritorio con la propiedad "
++"«gtk-enable-tooltips» de GTK+."
+
+ #: ../data/org.gnome.gnome-panel.gschema.xml.in.in.h:3
+ msgid "Confirm panel removal"
+@@ -1070,8 +1071,8 @@ msgid ""
+ "dialog is shown is controlled by the show_program_list key."
+ msgstr ""
+ "Si está activada, se hará disponible la lista «Aplicaciones conocidas» en el "
+-"diálogo «Ejecutar una aplicación». La clave «show_program_list» controla si la "
+-"lista se encuentra expandida o no cuando se muestra el diálogo."
++"diálogo «Ejecutar una aplicación». La clave «show_program_list» controla si "
++"la lista se encuentra expandida o no cuando se muestra el diálogo."
+
+ #: ../data/org.gnome.gnome-panel.gschema.xml.in.in.h:19
+ msgid "Expand program list in \"Run Application\" dialog"
+@@ -1260,12 +1261,12 @@ msgid ""
+ "panel."
+ msgstr ""
+ "La orientación del panel. Los valores posibles son «top», «bottom», «left», "
+-"«right». En el modo expandido la clave especifica en qué borde de la pantalla "
+-"está el panel. En el modo no expandido, la diferencia entre «top» y «bottom» "
+-"es menos importante, ambos indican que es un panel horizontal, pero todavía "
+-"da una indicación útil sobre cómo se deberían comportar algunos objetos de "
+-"los paneles. Por ejemplo, en un panel «top» (superior) un botón de menú "
+-"mostrará su menú por debajo del panel, mientras que un panel "
++"«right». En el modo expandido la clave especifica en qué borde de la "
++"pantalla está el panel. En el modo no expandido, la diferencia entre «top» y "
++"«bottom» es menos importante, ambos indican que es un panel horizontal, pero "
++"todavía da una indicación útil sobre cómo se deberían comportar algunos "
++"objetos de los paneles. Por ejemplo, en un panel «top» (superior) un botón "
++"de menú mostrará su menú por debajo del panel, mientras que un panel "
+ "«bottom» (inferior) el menú se mostrará por encima del panel."
+
+ #: ../data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in.h:11
+@@ -1382,8 +1383,8 @@ msgid ""
+ "at that position - i.e. the panel will grow on both sides. If false, the y "
+ "and y_bottom keys specify the location of the panel."
+ msgstr ""
+-"Si está activada, las claves «y» e «y_bottom» se ignoran y el panel se coloca "
+-"en el centro del eje-y de la pantalla. Si el panel se redimensiona "
++"Si está activada, las claves «y» e «y_bottom» se ignoran y el panel se "
++"coloca en el centro del eje-y de la pantalla. Si el panel se redimensiona "
+ "permanecerá en esa posición, por lo que el panel crecerá hacia ambos lados. "
+ "Si es «false» las claves «y» e «y_bottom» especifican la posición del panel."
+
+@@ -1479,8 +1480,8 @@ msgid ""
+ "enable_animations key is true."
+ msgstr ""
+ "La velocidad a la que deberían transcurrir las animaciones del panel. Los "
+-"valores posibles son «slow», «medium» y «fast». Esta clave sólo es relevante si "
+-"el valor de la clave «enable_animations» es «true»."
++"valores posibles son «slow», «medium» y «fast». Esta clave sólo es relevante "
++"si el valor de la clave «enable_animations» es «true»."
+
+ #: ../data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in.h:39
+ msgid "Background type"
+@@ -1494,9 +1495,9 @@ msgid ""
+ "specified by the image key will be used as background."
+ msgstr ""
+ "Qué tipo de fondo debería usarse para este panel. Los valores posibles son "
+-"«none»; se usará el fondo predeterminado del widget GTK+; «color» se usará la "
+-"clave «color» como color de fondo o «image» se usará la imagen especificada "
+-"por la clave «image» como fondo."
++"«none»; se usará el fondo predeterminado del widget GTK+; «color» se usará "
++"la clave «color» como color de fondo o «image» se usará la imagen "
++"especificada por la clave «image» como fondo."
+
+ #: ../data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in.h:41
+ msgid "Background color"
+@@ -1545,10 +1546,10 @@ msgid ""
+ "ratio of the image) to the panel height (if horizontal)."
+ msgstr ""
+ "Determina cómo se renderiza la imagen establecida por «image-url». Los "
+-"valores posibles son «none», «stretch» y «fit». «stretch» escalará la imagen a "
+-"las dimensiones del panel y no se mantendrá la proporción del aspecto. «fit» "
+-"escalará la imagen (manteniendo la proporción del aspecto) a la altura del "
+-"panel (si es horizontal)."
++"valores posibles son «none», «stretch» y «fit». «stretch» escalará la imagen "
++"a las dimensiones del panel y no se mantendrá la proporción del aspecto. "
++"«fit» escalará la imagen (manteniendo la proporción del aspecto) a la altura "
++"del panel (si es horizontal)."
+
+ #: ../gnome-panel/applet.c:359
+ msgid "???"
+@@ -1562,29 +1563,29 @@ msgstr "_Mover"
+ msgid "_Remove From Panel"
+ msgstr "_Quitar del panel"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:29
++#: ../gnome-panel/gnome-desktop-item-edit.c:27
+ msgid "Create new file in the given directory"
+ msgstr "Crea un archivo nuevo en la carpeta dada"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:30
++#: ../gnome-panel/gnome-desktop-item-edit.c:28
+ msgid "[FILE...]"
+ msgstr "[ARCHIVO…]"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:108
++#: ../gnome-panel/gnome-desktop-item-edit.c:106
+ msgid "- Edit .desktop files"
+ msgstr "– Edita archivos .desktop"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:146
+-#: ../gnome-panel/gnome-desktop-item-edit.c:200 ../gnome-panel/launcher.c:892
++#: ../gnome-panel/gnome-desktop-item-edit.c:144
++#: ../gnome-panel/gnome-desktop-item-edit.c:198 ../gnome-panel/launcher.c:894
+ msgid "Create Launcher"
+ msgstr "Crear lanzador"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:171
+-#: ../gnome-panel/gnome-desktop-item-edit.c:194
++#: ../gnome-panel/gnome-desktop-item-edit.c:169
++#: ../gnome-panel/gnome-desktop-item-edit.c:192
+ msgid "Directory Properties"
+ msgstr "Propiedades de la carpeta"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:177 ../gnome-panel/launcher.c:732
++#: ../gnome-panel/gnome-desktop-item-edit.c:175 ../gnome-panel/launcher.c:732
+ msgid "Launcher Properties"
+ msgstr "Propiedades del lanzador"
+
+@@ -1628,27 +1629,27 @@ msgstr ""
+ #, c-format
+ msgid "Unable to open desktop file %s for panel launcher%s%s\n"
+ msgstr ""
+-"No se puede abrir el archivo de escritorio %s para el lanzador del panel%s%"
+-"s\n"
++"No se puede abrir el archivo de escritorio %s para el lanzador del panel%s"
++"%s\n"
+
+-#: ../gnome-panel/launcher.c:796
++#: ../gnome-panel/launcher.c:798
+ msgid "_Launch"
+ msgstr "_Lanzar"
+
+-#: ../gnome-panel/launcher.c:802 ../gnome-panel/panel-action-button.c:139
++#: ../gnome-panel/launcher.c:804 ../gnome-panel/panel-action-button.c:172
+ #: ../gnome-panel/panel-context-menu.c:133
+ msgid "_Properties"
+ msgstr "_Propiedades"
+
+-#: ../gnome-panel/launcher.c:833
++#: ../gnome-panel/launcher.c:835
+ #, c-format
+ msgid "Launcher location is not set, cannot load launcher\n"
+ msgstr ""
+ "La ubicación del lanzador no está definida, no se puede cargar el lanzador\n"
+
+-#: ../gnome-panel/launcher.c:963 ../gnome-panel/panel-ditem-editor.c:1352
+-#: ../gnome-panel/panel-ditem-editor.c:1386
+-#: ../gnome-panel/panel-ditem-editor.c:1417
++#: ../gnome-panel/launcher.c:965 ../gnome-panel/panel-ditem-editor.c:1317
++#: ../gnome-panel/panel-ditem-editor.c:1351
++#: ../gnome-panel/panel-ditem-editor.c:1382
+ msgid "Could not save launcher"
+ msgstr "No se pudo guardar el lanzador"
+
+@@ -1749,81 +1750,81 @@ msgstr "No hay instalada ninguna aplicación para manejar búsqueda de carpetas.
+ msgid "Replace a currently running panel"
+ msgstr "Reemplazar un panel actualmente en ejecución"
+
+-#: ../gnome-panel/panel-action-button.c:127
++#: ../gnome-panel/panel-action-button.c:160
+ msgid "_Lock Screen"
+ msgstr "_Bloquear la pantalla"
+
+-#: ../gnome-panel/panel-action-button.c:133
++#: ../gnome-panel/panel-action-button.c:166
+ msgid "_Activate Screensaver"
+ msgstr "_Activar el salvapantallas"
+
+-#: ../gnome-panel/panel-action-button.c:239
++#: ../gnome-panel/panel-action-button.c:272
+ msgid "Connect to server"
+ msgstr "Conectar con el servidor"
+
+-#: ../gnome-panel/panel-action-button.c:263
++#: ../gnome-panel/panel-action-button.c:296
+ msgid "Could not connect to server"
+ msgstr "No se pudo conectar con el servidor"
+
+-#: ../gnome-panel/panel-action-button.c:293
++#: ../gnome-panel/panel-action-button.c:326
+ msgid "Lock Screen"
+ msgstr "Bloquear la pantalla"
+
+-#: ../gnome-panel/panel-action-button.c:294
++#: ../gnome-panel/panel-action-button.c:327
+ msgid "Protect your computer from unauthorized use"
+ msgstr "Proteja su equipo del uso no autorizado"
+
+ #. when changing one of those two strings, don't forget to
+ #. * update the ones in panel-menu-items.c (look for
+ #. * "1" (msgctxt: "panel:showusername"))
+-#: ../gnome-panel/panel-action-button.c:307
++#: ../gnome-panel/panel-action-button.c:340
+ msgid "Log Out"
+ msgstr "Cerrar la sesión"
+
+-#: ../gnome-panel/panel-action-button.c:308
++#: ../gnome-panel/panel-action-button.c:341
+ msgid "Log out of this session to log in as a different user"
+ msgstr "Sale de esta sesión para entrar como un usuario diferente"
+
+-#: ../gnome-panel/panel-action-button.c:316
++#: ../gnome-panel/panel-action-button.c:349
+ msgid "Run Application..."
+ msgstr "Ejecutar una aplicación…"
+
+-#: ../gnome-panel/panel-action-button.c:317
++#: ../gnome-panel/panel-action-button.c:350
+ msgid "Run an application by typing a command or choosing from a list"
+ msgstr ""
+ "Ejecute una aplicación introduciendo un comando o eligiéndolo de una lista"
+
+-#: ../gnome-panel/panel-action-button.c:325
++#: ../gnome-panel/panel-action-button.c:358
+ msgid "Search for Files..."
+ msgstr "Buscar archivos…"
+
+-#: ../gnome-panel/panel-action-button.c:326
++#: ../gnome-panel/panel-action-button.c:359
+ msgid "Locate documents and folders on this computer by name or content"
+ msgstr "Localice documentos y carpetas por nombre o contenido en este equipo"
+
+-#: ../gnome-panel/panel-action-button.c:333
+-#: ../gnome-panel/panel-force-quit.c:239
++#: ../gnome-panel/panel-action-button.c:366
++#: ../gnome-panel/panel-force-quit.c:241
+ msgid "Force Quit"
+ msgstr "Forzar la salida"
+
+-#: ../gnome-panel/panel-action-button.c:334
++#: ../gnome-panel/panel-action-button.c:367
+ msgid "Force a misbehaving application to quit"
+ msgstr "Obliga a una aplicación de comportamiento errático a terminar"
+
+ #. FIXME icon
+-#: ../gnome-panel/panel-action-button.c:342
++#: ../gnome-panel/panel-action-button.c:375
+ msgid "Connect to Server..."
+ msgstr "Conectar con el servidor…"
+
+-#: ../gnome-panel/panel-action-button.c:343
++#: ../gnome-panel/panel-action-button.c:376
+ msgid "Connect to a remote computer or shared disk"
+ msgstr "Conectar con un equipo remoto o un disco compartido"
+
+-#: ../gnome-panel/panel-action-button.c:350
++#: ../gnome-panel/panel-action-button.c:383
+ msgid "Power Off"
+ msgstr "Apagar"
+
+-#: ../gnome-panel/panel-action-button.c:351
++#: ../gnome-panel/panel-action-button.c:384
+ msgid "Power off the computer"
+ msgstr "Apagar el equipo"
+
+@@ -1931,7 +1932,7 @@ msgid "Open URL: %s"
+ msgstr "Abrir URL: %s"
+
+ #. Translators: %s is a URI
+-#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:645
++#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:640
+ #, c-format
+ msgid "Open '%s'"
+ msgstr "Abrir «%s»"
+@@ -1939,18 +1940,18 @@ msgstr "Abrir «%s»"
+ #. is_exec?
+ #. exec
+ #. name
+-#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1200
++#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1194
+ msgid "Open your personal folder"
+ msgstr "Abrir su carpeta personal"
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1236
++#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1223
+ msgid "Computer"
+ msgstr "Equipo"
+
+ #. name
+-#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1242
++#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1224
+ msgid ""
+ "Browse all local and remote disks and folders accessible from this computer"
+ msgstr ""
+@@ -1958,12 +1959,12 @@ msgstr ""
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1252
++#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1233
+ msgid "Network"
+ msgstr "Red"
+
+ #. name
+-#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1253
++#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1234
+ msgid "Browse bookmarked and local network locations"
+ msgstr "Examinar los lugares locales y remotos marcados"
+
+@@ -2012,74 +2013,74 @@ msgid "Location"
+ msgstr "Lugar"
+
+ #. Type
+-#: ../gnome-panel/panel-ditem-editor.c:616
++#: ../gnome-panel/panel-ditem-editor.c:602
+ msgid "_Type:"
+ msgstr "_Tipo:"
+
+ # Esta cadena aparece en la ayuda
+ #. Name
+-#: ../gnome-panel/panel-ditem-editor.c:623
++#: ../gnome-panel/panel-ditem-editor.c:609
+ msgid "_Name:"
+ msgstr "_Nombre:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:650
++#: ../gnome-panel/panel-ditem-editor.c:634
+ msgid "_Browse..."
+ msgstr "E_xaminar…"
+
+ #. Comment
+-#: ../gnome-panel/panel-ditem-editor.c:657
++#: ../gnome-panel/panel-ditem-editor.c:641
+ msgid "Co_mment:"
+ msgstr "Co_mentario:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1003
++#: ../gnome-panel/panel-ditem-editor.c:968
+ msgid "Choose an application..."
+ msgstr "Elija una aplicación…"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1007
++#: ../gnome-panel/panel-ditem-editor.c:972
+ msgid "Choose a file..."
+ msgstr "Elija un archivo…"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1172
+-#: ../gnome-panel/panel-ditem-editor.c:1181
++#: ../gnome-panel/panel-ditem-editor.c:1137
++#: ../gnome-panel/panel-ditem-editor.c:1146
+ msgid "Comm_and:"
+ msgstr "Coman_do:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1190
++#: ../gnome-panel/panel-ditem-editor.c:1155
+ msgid "_Location:"
+ msgstr "_Lugar:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1353
++#: ../gnome-panel/panel-ditem-editor.c:1318
+ msgid "The name of the launcher is not set."
+ msgstr "No se ha establecido el nombre del lanzador."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1357
++#: ../gnome-panel/panel-ditem-editor.c:1322
+ msgid "Could not save directory properties"
+ msgstr "No se pudieron guardar las propiedades de la carpeta"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1358
++#: ../gnome-panel/panel-ditem-editor.c:1323
+ msgid "The name of the directory is not set."
+ msgstr "No se ha establecido el nombre de la carpeta."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1374
++#: ../gnome-panel/panel-ditem-editor.c:1339
+ msgid "The command of the launcher is not set."
+ msgstr "No se ha establecido un comando para el lanzador."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1377
++#: ../gnome-panel/panel-ditem-editor.c:1342
+ msgid "The location of the launcher is not set."
+ msgstr "No se ha establecido el lugar del lanzador."
+
+-#: ../gnome-panel/panel-force-quit.c:77
++#: ../gnome-panel/panel-force-quit.c:79
+ msgid ""
+ "Click on a window to force the application to quit. To cancel press <ESC>."
+ msgstr ""
+ "Pulse en una ventana para forzar la terminación de una aplicación. Para "
+ "cancelar pulse <ESC>."
+
+-#: ../gnome-panel/panel-force-quit.c:222
++#: ../gnome-panel/panel-force-quit.c:224
+ msgid "Force this application to exit?"
+ msgstr "¿Forzar esta aplicación a terminar?"
+
+-#: ../gnome-panel/panel-force-quit.c:225
++#: ../gnome-panel/panel-force-quit.c:227
+ msgid ""
+ "If you choose to force an application to exit, unsaved changes in any open "
+ "documents in it might get lost."
+@@ -2087,7 +2088,7 @@ msgstr ""
+ "Si elige forzar una aplicación a terminar, se perderá cualquier cambio sin "
+ "guardar en cualquier documento abierto en ella."
+
+-#: ../gnome-panel/panel-layout.c:1197 ../gnome-panel/panel-layout.c:1211
++#: ../gnome-panel/panel-layout.c:1219 ../gnome-panel/panel-layout.c:1233
+ #, c-format
+ msgid "Cannot create initial panel layout.\n"
+ msgstr "No se puede crear la distribución inicial del panel.\n"
+@@ -2108,63 +2109,63 @@ msgstr "Aplicaciones"
+ msgid "_Edit Menus"
+ msgstr "_Editar menús"
+
+-#: ../gnome-panel/panel-menu-items.c:491
++#: ../gnome-panel/panel-menu-items.c:486
+ msgid "Switch User"
+ msgstr "Cambiar de usuario"
+
+-#: ../gnome-panel/panel-menu-items.c:621
++#: ../gnome-panel/panel-menu-items.c:616
+ msgid "Bookmarks"
+ msgstr "Marcadores"
+
+-#: ../gnome-panel/panel-menu-items.c:716
++#: ../gnome-panel/panel-menu-items.c:711
+ #, c-format
+ msgid "Unable to scan %s for media changes"
+ msgstr "No se pudo inspeccionar %s para buscar cambios en el soporte"
+
+-#: ../gnome-panel/panel-menu-items.c:758
++#: ../gnome-panel/panel-menu-items.c:753
+ #, c-format
+ msgid "Rescan %s"
+ msgstr "Volver a inspeccionar %s"
+
+-#: ../gnome-panel/panel-menu-items.c:795
++#: ../gnome-panel/panel-menu-items.c:790
+ #, c-format
+ msgid "Unable to mount %s"
+ msgstr "No se pudo montar %s"
+
+-#: ../gnome-panel/panel-menu-items.c:857
++#: ../gnome-panel/panel-menu-items.c:852
+ #, c-format
+ msgid "Mount %s"
+ msgstr "Montar %s"
+
+-#: ../gnome-panel/panel-menu-items.c:1065
++#: ../gnome-panel/panel-menu-items.c:1060
+ msgid "Removable Media"
+ msgstr "Soportes extraíbles"
+
+-#: ../gnome-panel/panel-menu-items.c:1156
++#: ../gnome-panel/panel-menu-items.c:1151
+ msgid "Network Places"
+ msgstr "Lugares en la red"
+
+ #. Translators: Desktop is used here as in
+ #. * "Desktop Folder" (this is not the Desktop
+ #. * environment).
+-#: ../gnome-panel/panel-menu-items.c:1220
++#: ../gnome-panel/panel-menu-items.c:1211
+ msgctxt "Desktop Folder"
+ msgid "Desktop"
+ msgstr "Escritorio"
+
+-#: ../gnome-panel/panel-menu-items.c:1221
++#: ../gnome-panel/panel-menu-items.c:1212
+ msgid "Open the contents of your desktop in a folder"
+ msgstr "Abrir los contenidos de su escritorio en una carpeta"
+
+-#: ../gnome-panel/panel-menu-items.c:1358
++#: ../gnome-panel/panel-menu-items.c:1336
+ msgid "Available"
+ msgstr "Disponible"
+
+-#: ../gnome-panel/panel-menu-items.c:1368
++#: ../gnome-panel/panel-menu-items.c:1346
+ msgid "Busy"
+ msgstr "Ocupado"
+
+-#: ../gnome-panel/panel-menu-items.c:1621
++#: ../gnome-panel/panel-menu-items.c:1578
+ msgid "Places"
+ msgstr "Lugares"
+
+@@ -2517,91 +2518,91 @@ msgstr "Ocultar panel"
+
+ #. translators: these string will be shown in MetaCity's switch window
+ #. * popup when you pass the focus to a panel
+-#: ../gnome-panel/panel-toplevel.c:1657
++#: ../gnome-panel/panel-toplevel.c:1648
+ msgid "Top Expanded Edge Panel"
+ msgstr "Panel expandido lateral superior"
+
+-#: ../gnome-panel/panel-toplevel.c:1658
++#: ../gnome-panel/panel-toplevel.c:1649
+ msgid "Top Centered Panel"
+ msgstr "Panel centrado superior"
+
+-#: ../gnome-panel/panel-toplevel.c:1659
++#: ../gnome-panel/panel-toplevel.c:1650
+ msgid "Top Floating Panel"
+ msgstr "Panel flotante superior"
+
+-#: ../gnome-panel/panel-toplevel.c:1660
++#: ../gnome-panel/panel-toplevel.c:1651
+ msgid "Top Edge Panel"
+ msgstr "Panel lateral superior"
+
+-#: ../gnome-panel/panel-toplevel.c:1664
++#: ../gnome-panel/panel-toplevel.c:1655
+ msgid "Bottom Expanded Edge Panel"
+ msgstr "Panel expandido lateral inferior"
+
+-#: ../gnome-panel/panel-toplevel.c:1665
++#: ../gnome-panel/panel-toplevel.c:1656
+ msgid "Bottom Centered Panel"
+ msgstr "Panel centrado inferior"
+
+-#: ../gnome-panel/panel-toplevel.c:1666
++#: ../gnome-panel/panel-toplevel.c:1657
+ msgid "Bottom Floating Panel"
+ msgstr "Panel flotante inferior"
+
+-#: ../gnome-panel/panel-toplevel.c:1667
++#: ../gnome-panel/panel-toplevel.c:1658
+ msgid "Bottom Edge Panel"
+ msgstr "Panel del borde inferior"
+
+-#: ../gnome-panel/panel-toplevel.c:1671
++#: ../gnome-panel/panel-toplevel.c:1662
+ msgid "Left Expanded Edge Panel"
+ msgstr "Panel expandido lateral izquierdo"
+
+-#: ../gnome-panel/panel-toplevel.c:1672
++#: ../gnome-panel/panel-toplevel.c:1663
+ msgid "Left Centered Panel"
+ msgstr "Panel centrado izquierdo"
+
+-#: ../gnome-panel/panel-toplevel.c:1673
++#: ../gnome-panel/panel-toplevel.c:1664
+ msgid "Left Floating Panel"
+ msgstr "Panel flotante izquierdo"
+
+-#: ../gnome-panel/panel-toplevel.c:1674
++#: ../gnome-panel/panel-toplevel.c:1665
+ msgid "Left Edge Panel"
+ msgstr "Panel lateral izquierdo"
+
+-#: ../gnome-panel/panel-toplevel.c:1678
++#: ../gnome-panel/panel-toplevel.c:1669
+ msgid "Right Expanded Edge Panel"
+ msgstr "Panel lateral expandido derecho"
+
+-#: ../gnome-panel/panel-toplevel.c:1679
++#: ../gnome-panel/panel-toplevel.c:1670
+ msgid "Right Centered Panel"
+ msgstr "Panel centrado derecho"
+
+-#: ../gnome-panel/panel-toplevel.c:1680
++#: ../gnome-panel/panel-toplevel.c:1671
+ msgid "Right Floating Panel"
+ msgstr "Panel flotante derecho"
+
+-#: ../gnome-panel/panel-toplevel.c:1681
++#: ../gnome-panel/panel-toplevel.c:1672
+ msgid "Right Edge Panel"
+ msgstr "Panel lateral derecho"
+
+-#: ../gnome-panel/panel-util.c:314
++#: ../gnome-panel/panel-util.c:313
+ #, c-format
+ msgid "Icon '%s' not found"
+ msgstr "El icono «%s» no se ha encontrado"
+
+ # Esta cadena aparece en la ayuda
+-#: ../gnome-panel/panel-util.c:557
++#: ../gnome-panel/panel-util.c:556
+ msgid "file"
+ msgstr "archivo"
+
+-#: ../gnome-panel/panel-util.c:734
++#: ../gnome-panel/panel-util.c:731
+ msgid "Home Folder"
+ msgstr "Carpeta personal"
+
+ #. Translators: this is the same string as the one found in
+ #. * nautilus
+-#: ../gnome-panel/panel-util.c:746
++#: ../gnome-panel/panel-util.c:743
+ msgid "File System"
+ msgstr "Sistema de archivos"
+
+-#: ../gnome-panel/panel-util.c:919
++#: ../gnome-panel/panel-util.c:916
+ msgid "Search"
+ msgstr "Buscar"
+
+@@ -2610,7 +2611,7 @@ msgstr "Buscar"
+ #. * example, "Trash: some-directory". It means that the
+ #. * directory called "some-directory" is in the trash.
+ #.
+-#: ../gnome-panel/panel-util.c:965
++#: ../gnome-panel/panel-util.c:962
+ #, c-format
+ msgid "%1$s: %2$s"
+ msgstr "%1$s: %2$s"
+@@ -2922,8 +2923,8 @@ msgstr "Una miniaplicación simple para probar el panel de GNOME"
+ #~ "The Workspace Switcher shows you a small version of your workspaces that "
+ #~ "lets you manage your windows."
+ #~ msgstr ""
+-#~ "El «Selector de áreas de trabajo» muestra una pequeña versión de sus áreas "
+-#~ "de trabajo que le permite gestionar sus ventanas."
++#~ "El «Selector de áreas de trabajo» muestra una pequeña versión de sus "
++#~ "áreas de trabajo que le permite gestionar sus ventanas."
+
+ #~ msgid "Loc_k To Panel"
+ #~ msgstr "_Bloquear al panel"
+@@ -3112,9 +3113,9 @@ msgstr "Una miniaplicación simple para probar el panel de GNOME"
+ #~ "object_type key is \"menu-object\" or \"drawer-object\"."
+ #~ msgstr ""
+ #~ "Si está activada, la clave «custom_icon» se usa como un icono "
+-#~ "personalizado para el botón. Si es «false» (falso), la clave «custom_icon» "
+-#~ "se ignora. Esta clave sólo es relevante si la clave «object_type» contiene "
+-#~ "«menu-object» o «drawer-object»."
++#~ "personalizado para el botón. Si es «false» (falso), la clave "
++#~ "«custom_icon» se ignora. Esta clave sólo es relevante si la clave "
++#~ "«object_type» contiene «menu-object» o «drawer-object»."
+
+ #~ msgid ""
+ #~ "If true, the menu_path key is used as the path from which the menu "
+@@ -3148,8 +3149,8 @@ msgstr "Una miniaplicación simple para probar el panel de GNOME"
+ #~ "relevant if the object_type key is \"action-applet\"."
+ #~ msgstr ""
+ #~ "El tipo de acción que representa este botón. Los valores posibles son "
+-#~ "«lock», «logout», «run», «search» y «screenshot». Esta clave sólo es relevante "
+-#~ "si el valor de la clave «object_type» es «action-applet»."
++#~ "«lock», «logout», «run», «search» y «screenshot». Esta clave sólo es "
++#~ "relevante si el valor de la clave «object_type» es «action-applet»."
+
+ #~ msgid ""
+ #~ "The identifier of the panel attached to this drawer. This key is only "
+@@ -3182,8 +3183,8 @@ msgstr "Una miniaplicación simple para probar el panel de GNOME"
+ #~ "\", \"menu-bar\" and \"separator\"."
+ #~ msgstr ""
+ #~ "El tipo de objeto del panel. Los valores posibles son «drawer-object», "
+-#~ "«menu-object», «launcher-object», «external-applet», «action-applet», «menu-"
+-#~ "bar» y «separator»."
++#~ "«menu-object», «launcher-object», «external-applet», «action-applet», "
++#~ "«menu-bar» y «separator»."
+
+ #~ msgid ""
+ #~ "This key is deprecated, following the migration to a new library for "
+@@ -3212,8 +3213,8 @@ msgstr "Una miniaplicación simple para probar el panel de GNOME"
+ #~ "Panel '%s' is set to be displayed on screen %d which is not currently "
+ #~ "available. Not loading this panel."
+ #~ msgstr ""
+-#~ "El panel «%s» está configurado para mostrarse en la pantalla %d la cual no "
+-#~ "está disponible actualmente. Este panel no se cargará."
++#~ "El panel «%s» está configurado para mostrarse en la pantalla %d la cual "
++#~ "no está disponible actualmente. Este panel no se cargará."
+
+ #~ msgid "Error reading GConf boolean value '%s': %s"
+ #~ msgstr "Error al leer el valor booleano GConf «%s»: %s"
+diff --git a/po/gl.po b/po/gl.po
+index 4e44e49..562d685 100644
+--- po/gl.po
++++ po/gl.po
+@@ -705,12 +705,12 @@ msgstr "Mostrar os _nomes de espazo de traballo no selector"
+ msgid "Workspaces"
+ msgstr "Nomes dos espazos de traballo"
+
+-#: ../data/gnome-fallback.desktop.in.h:1
++#: ../data/gnome-flashback.desktop.in.h:1
+ #: ../data/gnome-flashback.session.desktop.in.h:1
+ msgid "GNOME Flashback"
+ msgstr "Retrospectiva de GNOME"
+
+-#: ../data/gnome-fallback.desktop.in.h:2
++#: ../data/gnome-flashback.desktop.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Esta sesión inicia sesión en GNOME co panel tradicional"
+
+diff --git a/po/lt.po b/po/lt.po
+index c6b71cc..0c79ee3 100644
+--- po/lt.po
++++ po/lt.po
+@@ -699,12 +699,12 @@ msgstr "_Rodyti darbalaukių vardus jungiklyje"
+ msgid "Workspaces"
+ msgstr "Darbalaukių vardai"
+
+-#: ../data/gnome-fallback.desktop.in.h:1
++#: ../data/gnome-flashback.desktop.in.h:1
+ #: ../data/gnome-flashback.session.desktop.in.h:1
+ msgid "GNOME Flashback"
+ msgstr "GNOME Prisiminimas"
+
+-#: ../data/gnome-fallback.desktop.in.h:2
++#: ../data/gnome-flashback.desktop.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Šis seansas prisijungia prie Jūsų GNOME su tradiciniu skydeliu"
+
+diff --git a/po/lv.po b/po/lv.po
+index 216ce31..7bdeb6d 100644
+--- po/lv.po
++++ po/lv.po
+@@ -5,13 +5,14 @@
+ # Artis Trops <hornet@navigators.lv>, 2000.
+ # Raivis Dejus <orvils@gmail.com>, 2006, 2007, 2009.
+ # Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2010, 2011.
+-# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
++# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: lv\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-09-24 13:58+0300\n"
+-"PO-Revision-Date: 2012-09-24 14:06+0300\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
++"panel&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2013-09-27 22:11+0000\n"
++"PO-Revision-Date: 2013-10-05 12:53+0300\n"
+ "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+ "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
+ "Language: lv\n"
+@@ -20,7 +21,7 @@ msgstr ""
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+ "2);\n"
+-"X-Generator: Lokalize 1.4\n"
++"X-Generator: Lokalize 1.5\n"
+
+ #. Translators: This is a strftime format string.
+ #. * It is used to display the time in 12-hours format
+@@ -30,7 +31,7 @@ msgstr ""
+ #. * It is used to display the time in 12-hours format (eg, like
+ #. * in the US: 8:10 am). The %p expands to am/pm.
+ #.
+-#: ../applets/clock/calendar-window.c:310
++#: ../applets/clock/calendar-window.c:311
+ #: ../applets/clock/clock-location-tile.c:503
+ msgid "%l:%M %p"
+ msgstr "%l:%M %p"
+@@ -42,7 +43,7 @@ msgstr "%l:%M %p"
+ #. * It is used to display the time in 24-hours format (eg, like
+ #. * in France: 20:10).
+ #.
+-#: ../applets/clock/calendar-window.c:315
++#: ../applets/clock/calendar-window.c:316
+ #: ../applets/clock/clock-location-tile.c:466
+ #: ../applets/clock/clock-location-tile.c:510
+ msgid "%H:%M"
+@@ -51,134 +52,134 @@ msgstr "%H:%M"
+ #. Translators: This is a strftime format string.
+ #. * It is used to display the start date of an appointment, in
+ #. * the most abbreviated way possible.
+-#: ../applets/clock/calendar-window.c:321
++#: ../applets/clock/calendar-window.c:322
+ msgid "%b %d"
+ msgstr "%d. %b"
+
+-#: ../applets/clock/calendar-window.c:830
++#: ../applets/clock/calendar-window.c:831
+ msgid "Tasks"
+ msgstr "Uzdevumi"
+
+-#: ../applets/clock/calendar-window.c:830
+-#: ../applets/clock/calendar-window.c:1013
+-#: ../applets/clock/calendar-window.c:1551
++#: ../applets/clock/calendar-window.c:831
++#: ../applets/clock/calendar-window.c:1014
++#: ../applets/clock/calendar-window.c:1552
+ msgid "Edit"
+ msgstr "Rediģēt"
+
+-#: ../applets/clock/calendar-window.c:953
++#: ../applets/clock/calendar-window.c:954
+ msgid "All Day"
+ msgstr "Visu dienu"
+
+-#: ../applets/clock/calendar-window.c:1097
++#: ../applets/clock/calendar-window.c:1098
+ msgid "Appointments"
+ msgstr "Tikšanās"
+
+-#: ../applets/clock/calendar-window.c:1122
++#: ../applets/clock/calendar-window.c:1123
+ msgid "Birthdays and Anniversaries"
+ msgstr "Dzimšanas dienas un gadadienas"
+
+-#: ../applets/clock/calendar-window.c:1147
++#: ../applets/clock/calendar-window.c:1148
+ msgid "Weather Information"
+ msgstr "Laikapstākļu informācija"
+
+-#: ../applets/clock/calendar-window.c:1551 ../applets/clock/clock.ui.h:22
++#: ../applets/clock/calendar-window.c:1552 ../applets/clock/clock.ui.h:22
+ msgid "Locations"
+ msgstr "Atrašanās vietas"
+
+-#: ../applets/clock/calendar-window.c:1806
++#: ../applets/clock/calendar-window.c:1807
+ msgid "Calendar"
+ msgstr "Kalendārs"
+
+ #. Translators: This is a strftime format string.
+ #. * It is used to display a date. Please leave "%%s" as it is:
+ #. * it will be used to insert the timezone name later.
+-#: ../applets/clock/clock.c:310
++#: ../applets/clock/clock.c:309
+ msgid "%A %B %d (%%s)"
+ msgstr "%A %d. %B (%%s)"
+
+-#: ../applets/clock/clock.c:322
++#: ../applets/clock/clock.c:321
+ msgid "Click to hide your appointments and tasks"
+ msgstr "Klikšķiniet, lai slēptu savus uzdevumus un tikšanās"
+
+-#: ../applets/clock/clock.c:325
++#: ../applets/clock/clock.c:324
+ msgid "Click to view your appointments and tasks"
+ msgstr "Klikšķiniet, lai skatītu savus uzdevumus un tikšanās"
+
+-#: ../applets/clock/clock.c:329
++#: ../applets/clock/clock.c:328
+ msgid "Click to hide month calendar"
+ msgstr "Klikšķiniet, lai slēptu mēneša kalendāru"
+
+-#: ../applets/clock/clock.c:332
++#: ../applets/clock/clock.c:331
+ msgid "Click to view month calendar"
+ msgstr "Klikšķiniet, lai skatītu mēneša kalendāru"
+
+-#: ../applets/clock/clock.c:992
++#: ../applets/clock/clock.c:991
+ msgid "Computer Clock"
+ msgstr "Datora pulkstenis"
+
+-#: ../applets/clock/clock.c:1171
++#: ../applets/clock/clock.c:1170
+ msgid "Failed to open the time settings"
+ msgstr "Neizdevās atvērt laika iestatījumus"
+
+-#: ../applets/clock/clock.c:1191 ../applets/fish/fish.c:1307
++#: ../applets/clock/clock.c:1190 ../applets/fish/fish.c:1307
+ #: ../applets/wncklet/window-list.c:155
+ #: ../applets/wncklet/workspace-switcher.c:218
+ msgid "_Preferences"
+ msgstr "_Iestatījumi"
+
+-#: ../applets/clock/clock.c:1194
++#: ../applets/clock/clock.c:1193
+ msgid "Copy Date and _Time"
+ msgstr "Kopē_t datumu un laiku"
+
+-#: ../applets/clock/clock.c:1197
++#: ../applets/clock/clock.c:1196
+ msgid "Ad_just Date & Time"
+ msgstr "No_regulēt datumu un laiku"
+
+-#: ../applets/clock/clock.c:1768
++#: ../applets/clock/clock.c:1767
+ msgid "Choose Location"
+ msgstr "Izvēlieties vietu"
+
+-#: ../applets/clock/clock.c:1847
++#: ../applets/clock/clock.c:1846
+ msgid "Edit Location"
+ msgstr "Rediģēt vietu"
+
+-#: ../applets/clock/clock.c:1881
++#: ../applets/clock/clock.c:1880
+ msgid "Kelvin"
+ msgstr "Kelvina grādi"
+
+-#: ../applets/clock/clock.c:1882
++#: ../applets/clock/clock.c:1881
+ msgid "Celsius"
+ msgstr "Celsija grādi"
+
+-#: ../applets/clock/clock.c:1883
++#: ../applets/clock/clock.c:1882
+ msgid "Fahrenheit"
+ msgstr "Fārenheita grādi"
+
+-#: ../applets/clock/clock.c:1888
++#: ../applets/clock/clock.c:1887
+ msgid "Meters per second (m/s)"
+ msgstr "Metri sekundē (m/s)"
+
+-#: ../applets/clock/clock.c:1889
++#: ../applets/clock/clock.c:1888
+ msgid "Kilometers per hour (kph)"
+ msgstr "Kilometri stundā (km/h)"
+
+-#: ../applets/clock/clock.c:1890
++#: ../applets/clock/clock.c:1889
+ msgid "Miles per hour (mph)"
+ msgstr "Jūdzes stundā (j/h)"
+
+-#: ../applets/clock/clock.c:1891
++#: ../applets/clock/clock.c:1890
+ msgid "Knots"
+ msgstr "Mezgli"
+
+-#: ../applets/clock/clock.c:1892
++#: ../applets/clock/clock.c:1891
+ msgid "Beaufort scale"
+ msgstr "Boforta skala"
+
+-#: ../applets/clock/clock.c:1945
++#: ../applets/clock/clock.c:1944
+ msgid "City Name"
+ msgstr "Pilsētas nosaukums"
+
+-#: ../applets/clock/clock.c:1949
++#: ../applets/clock/clock.c:1948
+ msgid "City Time Zone"
+ msgstr "Pilsētas laika zona"
+
+@@ -248,8 +249,8 @@ msgstr "Saullēkts: %s / saulriets: %s"
+ msgid ""
+ "Type a city, region, or country name and then select a match from the pop-up."
+ msgstr ""
+-"Ierakstiet pilsētu vai valsti, lai iegūtu iespējamo vietu sarakstu "
+-"no kura izvēlēties īsto."
++"Ierakstiet pilsētu vai valsti, lai iegūtu iespējamo vietu sarakstu no kura "
++"izvēlēties īsto."
+
+ #: ../applets/clock/clock.ui.h:3
+ msgid "_Timezone:"
+@@ -516,7 +517,7 @@ msgstr "Zivtiņa"
+ msgid "Display a swimming fish or another animated creature"
+ msgstr "Rādīt peldošu zivi vai kādu citu kustīgu radību"
+
+-#: ../applets/notification_area/main.c:242
++#: ../applets/notification_area/main.c:245
+ msgid "Panel Notification Area"
+ msgstr "Paneļa paziņojumu lauks"
+
+@@ -697,6 +698,15 @@ msgstr "Rādīt darba vietu _nosaukumus pārslēdzējā"
+ msgid "Workspaces"
+ msgstr "Darba vieta"
+
++#: ../data/gnome-flashback.desktop.in.in.h:1
++#: ../data/gnome-flashback.session.desktop.in.h:1
++msgid "GNOME Flashback"
++msgstr "GNOME Flashback"
++
++#: ../data/gnome-flashback.desktop.in.in.h:2
++msgid "This session logs you into GNOME with the traditional panel"
++msgstr "Šī sesija ieraksta jūs GNOME vidē ar tradicionālo paneli"
++
+ #: ../data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in.h:1
+ msgid "Show date in tooltip"
+ msgstr "Parādīt datumu paskaidrē"
+@@ -1733,7 +1743,7 @@ msgid "Locate documents and folders on this computer by name or content"
+ msgstr "Meklē datorā mapes un datnes pēc to nosaukumiem un satura"
+
+ #: ../gnome-panel/panel-action-button.c:333
+-#: ../gnome-panel/panel-force-quit.c:239
++#: ../gnome-panel/panel-force-quit.c:241
+ msgid "Force Quit"
+ msgstr "Piespiedu apturēšana"
+
+@@ -2000,18 +2010,18 @@ msgstr "Nav norādīta palaidēja komanda."
+ msgid "The location of the launcher is not set."
+ msgstr "Nav norādīta palaidēja atrašanās vieta."
+
+-#: ../gnome-panel/panel-force-quit.c:77
++#: ../gnome-panel/panel-force-quit.c:79
+ msgid ""
+ "Click on a window to force the application to quit. To cancel press <ESC>."
+ msgstr ""
+ "Uzklikšķiniet uz loga, lai liktu programmai beigt darbu. Lai atceltu "
+ "nospiediet <ESC>."
+
+-#: ../gnome-panel/panel-force-quit.c:222
++#: ../gnome-panel/panel-force-quit.c:224
+ msgid "Force this application to exit?"
+ msgstr "Likt šai programmai pārtraukt darbu?"
+
+-#: ../gnome-panel/panel-force-quit.c:225
++#: ../gnome-panel/panel-force-quit.c:227
+ msgid ""
+ "If you choose to force an application to exit, unsaved changes in any open "
+ "documents in it might get lost."
+@@ -2019,7 +2029,7 @@ msgstr ""
+ "Ja aizvēsiet šo lietotni piespiedu kārtā, atvērto dokumentu nesaglabātās "
+ "izmaiņas tiks zaudētas."
+
+-#: ../gnome-panel/panel-layout.c:1197 ../gnome-panel/panel-layout.c:1211
++#: ../gnome-panel/panel-layout.c:1189 ../gnome-panel/panel-layout.c:1203
+ #, c-format
+ msgid "Cannot create initial panel layout.\n"
+ msgstr "Nevaru izveidot sākotnējo paneļa izkārtojumu.\n"
+@@ -2262,31 +2272,35 @@ msgstr "Attīrīt nesen izmantotos dokumentus..."
+ msgid "Clear all items from the recent documents list"
+ msgstr "Notīrīt visus elementus nesen izmantoto dokumentu sarakstā"
+
+-#: ../gnome-panel/panel-run-dialog.c:361
++#: ../gnome-panel/panel-run-dialog.c:434
++msgid "Cannot find a terminal, using xterm, even if it may not work"
++msgstr "Nevar atrast termināli; lieto xterm, lai gan tas varētu nestrādāt"
++
++#: ../gnome-panel/panel-run-dialog.c:498
+ #, c-format
+ msgid "Could not run command '%s'"
+ msgstr "Nevar palaist komandu '%s'"
+
+-#: ../gnome-panel/panel-run-dialog.c:409
++#: ../gnome-panel/panel-run-dialog.c:548
+ #, c-format
+ msgid "Could not convert '%s' from UTF-8"
+ msgstr "Nevar pārveidot '%s' no UTF-8"
+
+-#: ../gnome-panel/panel-run-dialog.c:1156
++#: ../gnome-panel/panel-run-dialog.c:1295
+ msgid "Choose a file to append to the command..."
+ msgstr "Izvēlieties datni, ko pievienot komandai..."
+
+-#: ../gnome-panel/panel-run-dialog.c:1539
++#: ../gnome-panel/panel-run-dialog.c:1678
+ #: ../gnome-panel/panel-run-dialog.ui.h:9
+ msgid "Select an application to view its description."
+ msgstr "Izvēlieties programmu, kuras aprakstu vēlaties redzēt."
+
+-#: ../gnome-panel/panel-run-dialog.c:1577
++#: ../gnome-panel/panel-run-dialog.c:1716
+ #, c-format
+ msgid "Will run command: '%s'"
+ msgstr "Palaidīs komandu: '%s'"
+
+-#: ../gnome-panel/panel-run-dialog.c:1610
++#: ../gnome-panel/panel-run-dialog.c:1749
+ #, c-format
+ msgid "URI list dropped on run dialog had wrong format (%d) or length (%d)\n"
+ msgstr ""
+@@ -2432,73 +2446,73 @@ msgstr "_Sīklietotne:"
+ msgid "_Prefs Dir:"
+ msgstr "Iestatījumu ma_pe:"
+
+-#: ../gnome-panel/panel-toplevel.c:1272
++#: ../gnome-panel/panel-toplevel.c:1273
+ msgid "Hide Panel"
+ msgstr "Slēpt paneli"
+
+ #. translators: these string will be shown in MetaCity's switch window
+ #. * popup when you pass the focus to a panel
+-#: ../gnome-panel/panel-toplevel.c:1657
++#: ../gnome-panel/panel-toplevel.c:1658
+ msgid "Top Expanded Edge Panel"
+ msgstr "Virsējais izvērstās malas panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1658
++#: ../gnome-panel/panel-toplevel.c:1659
+ msgid "Top Centered Panel"
+ msgstr "Virsējais centrētais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1659
++#: ../gnome-panel/panel-toplevel.c:1660
+ msgid "Top Floating Panel"
+ msgstr "Virsējais peldošais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1660
++#: ../gnome-panel/panel-toplevel.c:1661
+ msgid "Top Edge Panel"
+ msgstr "Virsējais malas panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1664
++#: ../gnome-panel/panel-toplevel.c:1665
+ msgid "Bottom Expanded Edge Panel"
+ msgstr "Apakšējais izvērstais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1665
++#: ../gnome-panel/panel-toplevel.c:1666
+ msgid "Bottom Centered Panel"
+ msgstr "Apakšējais centrētais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1666
++#: ../gnome-panel/panel-toplevel.c:1667
+ msgid "Bottom Floating Panel"
+ msgstr "Apakšējais peldošais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1667
++#: ../gnome-panel/panel-toplevel.c:1668
+ msgid "Bottom Edge Panel"
+ msgstr "Apakšējais malas panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1671
++#: ../gnome-panel/panel-toplevel.c:1672
+ msgid "Left Expanded Edge Panel"
+ msgstr "Kreisās malas izvērstais malas panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1672
++#: ../gnome-panel/panel-toplevel.c:1673
+ msgid "Left Centered Panel"
+ msgstr "Kreisās malas centrētais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1673
++#: ../gnome-panel/panel-toplevel.c:1674
+ msgid "Left Floating Panel"
+ msgstr "Kreisās malas peldošais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1674
++#: ../gnome-panel/panel-toplevel.c:1675
+ msgid "Left Edge Panel"
+ msgstr "Kreisās malas panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1678
++#: ../gnome-panel/panel-toplevel.c:1679
+ msgid "Right Expanded Edge Panel"
+ msgstr "Labās malas izvērstais malas panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1679
++#: ../gnome-panel/panel-toplevel.c:1680
+ msgid "Right Centered Panel"
+ msgstr "Labās malas centrētais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1680
++#: ../gnome-panel/panel-toplevel.c:1681
+ msgid "Right Floating Panel"
+ msgstr "Labās malas peldošais panelis"
+
+-#: ../gnome-panel/panel-toplevel.c:1681
++#: ../gnome-panel/panel-toplevel.c:1682
+ msgid "Right Edge Panel"
+ msgstr "Labās malas malējais panelis"
+
+diff --git a/po/pl.po b/po/pl.po
+index 10903d7..daba188 100644
+--- po/pl.po
++++ po/pl.po
+@@ -16,8 +16,8 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-panel\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2013-08-20 23:30+0200\n"
+-"PO-Revision-Date: 2013-08-20 23:32+0200\n"
++"POT-Creation-Date: 2013-12-07 14:14+0100\n"
++"PO-Revision-Date: 2013-12-07 14:15+0100\n"
+ "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+ "Language-Team: Polish <gnomepl@aviary.pl>\n"
+ "Language: pl\n"
+@@ -68,7 +68,7 @@ msgstr "Zadania"
+
+ #: ../applets/clock/calendar-window.c:831
+ #: ../applets/clock/calendar-window.c:1014
+-#: ../applets/clock/calendar-window.c:1552
++#: ../applets/clock/calendar-window.c:1550
+ msgid "Edit"
+ msgstr "Modyfikuj"
+
+@@ -88,104 +88,104 @@ msgstr "Urodziny i rocznice"
+ msgid "Weather Information"
+ msgstr "Informacje pogodowe"
+
+-#: ../applets/clock/calendar-window.c:1552 ../applets/clock/clock.ui.h:22
++#: ../applets/clock/calendar-window.c:1550 ../applets/clock/clock.ui.h:22
+ msgid "Locations"
+ msgstr "Położenia"
+
+-#: ../applets/clock/calendar-window.c:1807
++#: ../applets/clock/calendar-window.c:1805
+ msgid "Calendar"
+ msgstr "Kalendarz"
+
+ #. Translators: This is a strftime format string.
+ #. * It is used to display a date. Please leave "%%s" as it is:
+ #. * it will be used to insert the timezone name later.
+-#: ../applets/clock/clock.c:309
++#: ../applets/clock/clock.c:297
+ msgid "%A %B %d (%%s)"
+ msgstr "%A, %d %B %Y (%%s)"
+
+-#: ../applets/clock/clock.c:321
++#: ../applets/clock/clock.c:309
+ msgid "Click to hide your appointments and tasks"
+ msgstr "Kliknięcie ukryje terminy i zadania"
+
+-#: ../applets/clock/clock.c:324
++#: ../applets/clock/clock.c:312
+ msgid "Click to view your appointments and tasks"
+ msgstr "Kliknięcie wyświetli terminy i zadania"
+
+-#: ../applets/clock/clock.c:328
++#: ../applets/clock/clock.c:316
+ msgid "Click to hide month calendar"
+ msgstr "Kliknięcie ukryje miesięczny kalendarz"
+
+-#: ../applets/clock/clock.c:331
++#: ../applets/clock/clock.c:319
+ msgid "Click to view month calendar"
+ msgstr "Kliknięcie wyświetli miesięczny kalendarz"
+
+-#: ../applets/clock/clock.c:991
++#: ../applets/clock/clock.c:956
+ msgid "Computer Clock"
+ msgstr "Zegar komputerowy"
+
+-#: ../applets/clock/clock.c:1170
++#: ../applets/clock/clock.c:1120
+ msgid "Failed to open the time settings"
+ msgstr "Otwarcie ustawień czasu się nie powiodło"
+
+-#: ../applets/clock/clock.c:1190 ../applets/fish/fish.c:1307
++#: ../applets/clock/clock.c:1140 ../applets/fish/fish.c:1307
+ #: ../applets/wncklet/window-list.c:155
+ #: ../applets/wncklet/workspace-switcher.c:218
+ msgid "_Preferences"
+ msgstr "P_referencje"
+
+-#: ../applets/clock/clock.c:1193
++#: ../applets/clock/clock.c:1143
+ msgid "Copy Date and _Time"
+ msgstr "Skopiuj datę i _czas"
+
+-#: ../applets/clock/clock.c:1196
++#: ../applets/clock/clock.c:1146
+ msgid "Ad_just Date & Time"
+ msgstr "Dos_tosuj datę i czas"
+
+-#: ../applets/clock/clock.c:1767
++#: ../applets/clock/clock.c:1714
+ msgid "Choose Location"
+ msgstr "Wybór położenia"
+
+-#: ../applets/clock/clock.c:1846
++#: ../applets/clock/clock.c:1793
+ msgid "Edit Location"
+ msgstr "Modyfikacja położenia"
+
+-#: ../applets/clock/clock.c:1880
++#: ../applets/clock/clock.c:1827
+ msgid "Kelvin"
+ msgstr "Kelviny"
+
+-#: ../applets/clock/clock.c:1881
++#: ../applets/clock/clock.c:1828
+ msgid "Celsius"
+ msgstr "Stopnie Celsjusza"
+
+-#: ../applets/clock/clock.c:1882
++#: ../applets/clock/clock.c:1829
+ msgid "Fahrenheit"
+ msgstr "Stopnie Fahrenheita"
+
+-#: ../applets/clock/clock.c:1887
++#: ../applets/clock/clock.c:1834
+ msgid "Meters per second (m/s)"
+ msgstr "Metry na sekundę (m/s)"
+
+-#: ../applets/clock/clock.c:1888
++#: ../applets/clock/clock.c:1835
+ msgid "Kilometers per hour (kph)"
+ msgstr "Kilometry na godzinę (km/s)"
+
+-#: ../applets/clock/clock.c:1889
++#: ../applets/clock/clock.c:1836
+ msgid "Miles per hour (mph)"
+ msgstr "Mile na godzinę (mph)"
+
+-#: ../applets/clock/clock.c:1890
++#: ../applets/clock/clock.c:1837
+ msgid "Knots"
+ msgstr "Węzły"
+
+-#: ../applets/clock/clock.c:1891
++#: ../applets/clock/clock.c:1838
+ msgid "Beaufort scale"
+ msgstr "Skala Beauforta"
+
+-#: ../applets/clock/clock.c:1944
++#: ../applets/clock/clock.c:1891
+ msgid "City Name"
+ msgstr "Nazwa miasta"
+
+-#: ../applets/clock/clock.c:1948
++#: ../applets/clock/clock.c:1895
+ msgid "City Time Zone"
+ msgstr "Strefa czasowa miasta"
+
+@@ -363,12 +363,12 @@ msgstr "Pogoda"
+ msgid "Time _Settings"
+ msgstr "_Ustawienia czasu"
+
+-#: ../applets/clock/clock-utils.c:97 ../applets/fish/fish.c:164
++#: ../applets/clock/clock-utils.c:96 ../applets/fish/fish.c:164
+ #, c-format
+ msgid "Could not display help document '%s'"
+ msgstr "Nie można wyświetlić dokumentu pomocy \"%s\""
+
+-#: ../applets/clock/clock-utils.c:126 ../applets/fish/fish.c:190
++#: ../applets/clock/clock-utils.c:125 ../applets/fish/fish.c:190
+ msgid "Error displaying help document"
+ msgstr "Błąd podczas wyświetlania dokumentu pomocy"
+
+@@ -524,7 +524,7 @@ msgstr "Rybka"
+ msgid "Display a swimming fish or another animated creature"
+ msgstr "Wyświetla pływającą rybkę lub inne animowane stworzenie"
+
+-#: ../applets/notification_area/main.c:245
++#: ../applets/notification_area/main.c:244
+ msgid "Panel Notification Area"
+ msgstr "Obszar powiadamiania panelu"
+
+@@ -659,13 +659,13 @@ msgid "Restore to na_tive workspace"
+ msgstr "Przywracanie n_a pierwotnym pulpicie"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ #: ../applets/wncklet/workspace-switcher.ui.h:4
+ msgid "rows"
+ msgstr "wierszach"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ msgid "columns"
+ msgstr "kolumnach"
+
+@@ -705,15 +705,27 @@ msgstr "Wyświetlanie _nazw obszarów roboczych"
+ msgid "Workspaces"
+ msgstr "Obszary robocze"
+
+-#: ../data/gnome-fallback.desktop.in.h:1
+-#: ../data/gnome-flashback.session.desktop.in.h:1
+-msgid "GNOME Flashback"
+-msgstr "Tradycyjne środowisko GNOME"
++#: ../data/gnome-flashback-compiz.desktop.in.in.h:1
++#: ../data/gnome-flashback-compiz.session.desktop.in.h:1
++msgid "GNOME Flashback (Compiz)"
++msgstr "Tradycyjne środowisko GNOME (Compiz)"
+
+-#: ../data/gnome-fallback.desktop.in.h:2
++#: ../data/gnome-flashback-compiz.desktop.in.in.h:2
++#: ../data/gnome-flashback.desktop.in.in.h:2
++#: ../data/gnome-flashback-mutter.desktop.in.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Ta sesja loguje do środowiska GNOME z tradycyjnym panelem"
+
++#: ../data/gnome-flashback.desktop.in.in.h:1
++#: ../data/gnome-flashback.session.desktop.in.h:1
++msgid "GNOME Flashback (Metacity)"
++msgstr "Tradycyjne środowisko GNOME (Metacity)"
++
++#: ../data/gnome-flashback-mutter.desktop.in.in.h:1
++#: ../data/gnome-flashback-mutter.session.desktop.in.h:1
++msgid "GNOME Flashback (Mutter)"
++msgstr "Tradycyjne środowisko GNOME (Mutter)"
++
+ #: ../data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in.h:1
+ msgid "Show date in tooltip"
+ msgstr "Wyświetlanie daty w podpowiedzi"
+@@ -1528,29 +1540,29 @@ msgstr "_Przesuń"
+ msgid "_Remove From Panel"
+ msgstr "U_suń z panelu"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:29
++#: ../gnome-panel/gnome-desktop-item-edit.c:27
+ msgid "Create new file in the given directory"
+ msgstr "Tworzy nowy plik w podanym katalogu"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:30
++#: ../gnome-panel/gnome-desktop-item-edit.c:28
+ msgid "[FILE...]"
+ msgstr "[PLIK...]"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:108
++#: ../gnome-panel/gnome-desktop-item-edit.c:106
+ msgid "- Edit .desktop files"
+ msgstr "- modyfikowanie plików .desktop"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:146
+-#: ../gnome-panel/gnome-desktop-item-edit.c:200 ../gnome-panel/launcher.c:892
++#: ../gnome-panel/gnome-desktop-item-edit.c:144
++#: ../gnome-panel/gnome-desktop-item-edit.c:198 ../gnome-panel/launcher.c:894
+ msgid "Create Launcher"
+ msgstr "Nowy aktywator"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:171
+-#: ../gnome-panel/gnome-desktop-item-edit.c:194
++#: ../gnome-panel/gnome-desktop-item-edit.c:169
++#: ../gnome-panel/gnome-desktop-item-edit.c:192
+ msgid "Directory Properties"
+ msgstr "Właściwości katalogu"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:177 ../gnome-panel/launcher.c:732
++#: ../gnome-panel/gnome-desktop-item-edit.c:175 ../gnome-panel/launcher.c:732
+ msgid "Launcher Properties"
+ msgstr "Właściwości aktywatora"
+
+@@ -1593,23 +1605,23 @@ msgstr "Dla pliku aktywatora panelu nie określono adresu URI\n"
+ msgid "Unable to open desktop file %s for panel launcher%s%s\n"
+ msgstr "Nie można otworzyć pliku %s z aktywatorem panelu%s%s\n"
+
+-#: ../gnome-panel/launcher.c:796
++#: ../gnome-panel/launcher.c:798
+ msgid "_Launch"
+ msgstr "_Uruchom"
+
+-#: ../gnome-panel/launcher.c:802 ../gnome-panel/panel-action-button.c:139
++#: ../gnome-panel/launcher.c:804 ../gnome-panel/panel-action-button.c:172
+ #: ../gnome-panel/panel-context-menu.c:133
+ msgid "_Properties"
+ msgstr "_Właściwości"
+
+-#: ../gnome-panel/launcher.c:833
++#: ../gnome-panel/launcher.c:835
+ #, c-format
+ msgid "Launcher location is not set, cannot load launcher\n"
+ msgstr "Położenie aktywatora nie jest ustawione, nie można go wczytać\n"
+
+-#: ../gnome-panel/launcher.c:963 ../gnome-panel/panel-ditem-editor.c:1352
+-#: ../gnome-panel/panel-ditem-editor.c:1386
+-#: ../gnome-panel/panel-ditem-editor.c:1417
++#: ../gnome-panel/launcher.c:965 ../gnome-panel/panel-ditem-editor.c:1317
++#: ../gnome-panel/panel-ditem-editor.c:1351
++#: ../gnome-panel/panel-ditem-editor.c:1382
+ msgid "Could not save launcher"
+ msgstr "Nie można zapisać aktywatora"
+
+@@ -1711,81 +1723,81 @@ msgstr "Brak programu do obsługi przeszukiwania katalogów."
+ msgid "Replace a currently running panel"
+ msgstr "Zamienia bieżąco uruchomiony panel"
+
+-#: ../gnome-panel/panel-action-button.c:127
++#: ../gnome-panel/panel-action-button.c:160
+ msgid "_Lock Screen"
+ msgstr "Za_blokuj ekran"
+
+-#: ../gnome-panel/panel-action-button.c:133
++#: ../gnome-panel/panel-action-button.c:166
+ msgid "_Activate Screensaver"
+ msgstr "Włącz wyg_aszacz ekranu"
+
+-#: ../gnome-panel/panel-action-button.c:239
++#: ../gnome-panel/panel-action-button.c:272
+ msgid "Connect to server"
+ msgstr "Połącz z serwerem"
+
+-#: ../gnome-panel/panel-action-button.c:263
++#: ../gnome-panel/panel-action-button.c:296
+ msgid "Could not connect to server"
+ msgstr "Nie można połączyć się z serwerem"
+
+-#: ../gnome-panel/panel-action-button.c:293
++#: ../gnome-panel/panel-action-button.c:326
+ msgid "Lock Screen"
+ msgstr "Zablokuj ekran"
+
+-#: ../gnome-panel/panel-action-button.c:294
++#: ../gnome-panel/panel-action-button.c:327
+ msgid "Protect your computer from unauthorized use"
+ msgstr "Zabezpiecza komputer przed nieupoważnionym dostępem"
+
+ #. when changing one of those two strings, don't forget to
+ #. * update the ones in panel-menu-items.c (look for
+ #. * "1" (msgctxt: "panel:showusername"))
+-#: ../gnome-panel/panel-action-button.c:307
++#: ../gnome-panel/panel-action-button.c:340
+ msgid "Log Out"
+ msgstr "Wyloguj się"
+
+-#: ../gnome-panel/panel-action-button.c:308
++#: ../gnome-panel/panel-action-button.c:341
+ msgid "Log out of this session to log in as a different user"
+ msgstr ""
+ "Kończy bieżącą sesję, pozwalając na zalogowanie się innemu użytkownikowi"
+
+-#: ../gnome-panel/panel-action-button.c:316
++#: ../gnome-panel/panel-action-button.c:349
+ msgid "Run Application..."
+ msgstr "Uruchom program..."
+
+-#: ../gnome-panel/panel-action-button.c:317
++#: ../gnome-panel/panel-action-button.c:350
+ msgid "Run an application by typing a command or choosing from a list"
+ msgstr "Uruchamia program wybrany z listy lub wprowadzone polecenie"
+
+-#: ../gnome-panel/panel-action-button.c:325
++#: ../gnome-panel/panel-action-button.c:358
+ msgid "Search for Files..."
+ msgstr "Wyszukaj pliki..."
+
+-#: ../gnome-panel/panel-action-button.c:326
++#: ../gnome-panel/panel-action-button.c:359
+ msgid "Locate documents and folders on this computer by name or content"
+ msgstr "Wyszukuje dokumenty i katalogi według nazwy lub zawartości"
+
+-#: ../gnome-panel/panel-action-button.c:333
++#: ../gnome-panel/panel-action-button.c:366
+ #: ../gnome-panel/panel-force-quit.c:241
+ msgid "Force Quit"
+ msgstr "Wymuś zamknięcie"
+
+-#: ../gnome-panel/panel-action-button.c:334
++#: ../gnome-panel/panel-action-button.c:367
+ msgid "Force a misbehaving application to quit"
+ msgstr "Wymusza zakończenie źle działającego programu"
+
+ #. FIXME icon
+-#: ../gnome-panel/panel-action-button.c:342
++#: ../gnome-panel/panel-action-button.c:375
+ msgid "Connect to Server..."
+ msgstr "Połącz z serwerem..."
+
+-#: ../gnome-panel/panel-action-button.c:343
++#: ../gnome-panel/panel-action-button.c:376
+ msgid "Connect to a remote computer or shared disk"
+ msgstr "Łączy ze zdalnym serwerem lub udostępnionym dyskiem"
+
+-#: ../gnome-panel/panel-action-button.c:350
++#: ../gnome-panel/panel-action-button.c:383
+ msgid "Power Off"
+ msgstr "Wyłącz komputer"
+
+-#: ../gnome-panel/panel-action-button.c:351
++#: ../gnome-panel/panel-action-button.c:384
+ msgid "Power off the computer"
+ msgstr "Wyłącza komputer"
+
+@@ -1894,7 +1906,7 @@ msgid "Open URL: %s"
+ msgstr "Otwórz adres URL: %s"
+
+ #. Translators: %s is a URI
+-#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:645
++#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:640
+ #, c-format
+ msgid "Open '%s'"
+ msgstr "Otwiera \"%s\""
+@@ -1902,18 +1914,18 @@ msgstr "Otwiera \"%s\""
+ #. is_exec?
+ #. exec
+ #. name
+-#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1200
++#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1194
+ msgid "Open your personal folder"
+ msgstr "Otwiera katalog osobisty użytkownika"
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1236
++#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1223
+ msgid "Computer"
+ msgstr "Komputer"
+
+ #. name
+-#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1242
++#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1224
+ msgid ""
+ "Browse all local and remote disks and folders accessible from this computer"
+ msgstr ""
+@@ -1922,12 +1934,12 @@ msgstr ""
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1252
++#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1233
+ msgid "Network"
+ msgstr "Sieć"
+
+ #. name
+-#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1253
++#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1234
+ msgid "Browse bookmarked and local network locations"
+ msgstr "Przegląda zakładki i lokalne położenia sieciowe"
+
+@@ -1976,58 +1988,58 @@ msgid "Location"
+ msgstr "Położenie"
+
+ #. Type
+-#: ../gnome-panel/panel-ditem-editor.c:616
++#: ../gnome-panel/panel-ditem-editor.c:602
+ msgid "_Type:"
+ msgstr "_Typ:"
+
+ #. Name
+-#: ../gnome-panel/panel-ditem-editor.c:623
++#: ../gnome-panel/panel-ditem-editor.c:609
+ msgid "_Name:"
+ msgstr "_Nazwa:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:650
++#: ../gnome-panel/panel-ditem-editor.c:634
+ msgid "_Browse..."
+ msgstr "P_rzeglądaj..."
+
+ #. Comment
+-#: ../gnome-panel/panel-ditem-editor.c:657
++#: ../gnome-panel/panel-ditem-editor.c:641
+ msgid "Co_mment:"
+ msgstr "_Komentarz:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1003
++#: ../gnome-panel/panel-ditem-editor.c:968
+ msgid "Choose an application..."
+ msgstr "Wybór programu..."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1007
++#: ../gnome-panel/panel-ditem-editor.c:972
+ msgid "Choose a file..."
+ msgstr "Wybór pliku..."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1172
+-#: ../gnome-panel/panel-ditem-editor.c:1181
++#: ../gnome-panel/panel-ditem-editor.c:1137
++#: ../gnome-panel/panel-ditem-editor.c:1146
+ msgid "Comm_and:"
+ msgstr "P_olecenie:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1190
++#: ../gnome-panel/panel-ditem-editor.c:1155
+ msgid "_Location:"
+ msgstr "_Położenie:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1353
++#: ../gnome-panel/panel-ditem-editor.c:1318
+ msgid "The name of the launcher is not set."
+ msgstr "Nie określono nazwy aktywatora."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1357
++#: ../gnome-panel/panel-ditem-editor.c:1322
+ msgid "Could not save directory properties"
+ msgstr "Nie można zapisać właściwości katalogu"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1358
++#: ../gnome-panel/panel-ditem-editor.c:1323
+ msgid "The name of the directory is not set."
+ msgstr "Nie określono nazwy katalogu."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1374
++#: ../gnome-panel/panel-ditem-editor.c:1339
+ msgid "The command of the launcher is not set."
+ msgstr "Nie określono polecenia aktywatora."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1377
++#: ../gnome-panel/panel-ditem-editor.c:1342
+ msgid "The location of the launcher is not set."
+ msgstr "Nie określono położenia aktywatora."
+
+@@ -2050,7 +2062,7 @@ msgstr ""
+ "Jeśli wymusi się zakończenie programu, to wszystkie niezapisane zmiany w "
+ "otwartych dokumentach zostaną utracone."
+
+-#: ../gnome-panel/panel-layout.c:1197 ../gnome-panel/panel-layout.c:1211
++#: ../gnome-panel/panel-layout.c:1219 ../gnome-panel/panel-layout.c:1233
+ #, c-format
+ msgid "Cannot create initial panel layout.\n"
+ msgstr "Nie można utworzyć początkowego układu panelu.\n"
+@@ -2071,63 +2083,63 @@ msgstr "Programy"
+ msgid "_Edit Menus"
+ msgstr "_Modyfikuj menu"
+
+-#: ../gnome-panel/panel-menu-items.c:491
++#: ../gnome-panel/panel-menu-items.c:486
+ msgid "Switch User"
+ msgstr "Przełącz użytkownika"
+
+-#: ../gnome-panel/panel-menu-items.c:621
++#: ../gnome-panel/panel-menu-items.c:616
+ msgid "Bookmarks"
+ msgstr "Zakładki"
+
+-#: ../gnome-panel/panel-menu-items.c:716
++#: ../gnome-panel/panel-menu-items.c:711
+ #, c-format
+ msgid "Unable to scan %s for media changes"
+ msgstr "Nie można skanować %s w poszukiwaniu zmian nośników"
+
+-#: ../gnome-panel/panel-menu-items.c:758
++#: ../gnome-panel/panel-menu-items.c:753
+ #, c-format
+ msgid "Rescan %s"
+ msgstr "Skanuj %s ponownie"
+
+-#: ../gnome-panel/panel-menu-items.c:795
++#: ../gnome-panel/panel-menu-items.c:790
+ #, c-format
+ msgid "Unable to mount %s"
+ msgstr "Nie można zamontować %s"
+
+-#: ../gnome-panel/panel-menu-items.c:857
++#: ../gnome-panel/panel-menu-items.c:852
+ #, c-format
+ msgid "Mount %s"
+ msgstr "Montuje %s"
+
+-#: ../gnome-panel/panel-menu-items.c:1065
++#: ../gnome-panel/panel-menu-items.c:1060
+ msgid "Removable Media"
+ msgstr "Nośniki wymienne"
+
+-#: ../gnome-panel/panel-menu-items.c:1156
++#: ../gnome-panel/panel-menu-items.c:1151
+ msgid "Network Places"
+ msgstr "Miejsca sieciowe"
+
+ #. Translators: Desktop is used here as in
+ #. * "Desktop Folder" (this is not the Desktop
+ #. * environment).
+-#: ../gnome-panel/panel-menu-items.c:1220
++#: ../gnome-panel/panel-menu-items.c:1211
+ msgctxt "Desktop Folder"
+ msgid "Desktop"
+ msgstr "Pulpit"
+
+-#: ../gnome-panel/panel-menu-items.c:1221
++#: ../gnome-panel/panel-menu-items.c:1212
+ msgid "Open the contents of your desktop in a folder"
+ msgstr "Otwiera pulpit jako katalog"
+
+-#: ../gnome-panel/panel-menu-items.c:1358
++#: ../gnome-panel/panel-menu-items.c:1336
+ msgid "Available"
+ msgstr "Dostępny"
+
+-#: ../gnome-panel/panel-menu-items.c:1368
++#: ../gnome-panel/panel-menu-items.c:1346
+ msgid "Busy"
+ msgstr "Zajęty"
+
+-#: ../gnome-panel/panel-menu-items.c:1621
++#: ../gnome-panel/panel-menu-items.c:1578
+ msgid "Places"
+ msgstr "Miejsca"
+
+@@ -2473,90 +2485,90 @@ msgstr "Ukrywa panel"
+
+ #. translators: these string will be shown in MetaCity's switch window
+ #. * popup when you pass the focus to a panel
+-#: ../gnome-panel/panel-toplevel.c:1657
++#: ../gnome-panel/panel-toplevel.c:1648
+ msgid "Top Expanded Edge Panel"
+ msgstr "Górny rozwijany panel krawędziowy"
+
+-#: ../gnome-panel/panel-toplevel.c:1658
++#: ../gnome-panel/panel-toplevel.c:1649
+ msgid "Top Centered Panel"
+ msgstr "Górny panel wyśrodkowany"
+
+-#: ../gnome-panel/panel-toplevel.c:1659
++#: ../gnome-panel/panel-toplevel.c:1650
+ msgid "Top Floating Panel"
+ msgstr "Górny panel oderwany"
+
+-#: ../gnome-panel/panel-toplevel.c:1660
++#: ../gnome-panel/panel-toplevel.c:1651
+ msgid "Top Edge Panel"
+ msgstr "Górny panel krawędziowy"
+
+-#: ../gnome-panel/panel-toplevel.c:1664
++#: ../gnome-panel/panel-toplevel.c:1655
+ msgid "Bottom Expanded Edge Panel"
+ msgstr "Dolny rozwijany panel krawędziowy"
+
+-#: ../gnome-panel/panel-toplevel.c:1665
++#: ../gnome-panel/panel-toplevel.c:1656
+ msgid "Bottom Centered Panel"
+ msgstr "Dolny panel wyśrodkowany"
+
+-#: ../gnome-panel/panel-toplevel.c:1666
++#: ../gnome-panel/panel-toplevel.c:1657
+ msgid "Bottom Floating Panel"
+ msgstr "Dolny panel oderwany"
+
+-#: ../gnome-panel/panel-toplevel.c:1667
++#: ../gnome-panel/panel-toplevel.c:1658
+ msgid "Bottom Edge Panel"
+ msgstr "Dolny panel krawędziowy"
+
+-#: ../gnome-panel/panel-toplevel.c:1671
++#: ../gnome-panel/panel-toplevel.c:1662
+ msgid "Left Expanded Edge Panel"
+ msgstr "Dolny rozwijany panel krawędziowy"
+
+-#: ../gnome-panel/panel-toplevel.c:1672
++#: ../gnome-panel/panel-toplevel.c:1663
+ msgid "Left Centered Panel"
+ msgstr "Lewy panel wyśrodkowany"
+
+-#: ../gnome-panel/panel-toplevel.c:1673
++#: ../gnome-panel/panel-toplevel.c:1664
+ msgid "Left Floating Panel"
+ msgstr "Lewy panel oderwany"
+
+-#: ../gnome-panel/panel-toplevel.c:1674
++#: ../gnome-panel/panel-toplevel.c:1665
+ msgid "Left Edge Panel"
+ msgstr "Lewy panel krawędziowy"
+
+-#: ../gnome-panel/panel-toplevel.c:1678
++#: ../gnome-panel/panel-toplevel.c:1669
+ msgid "Right Expanded Edge Panel"
+ msgstr "Prawy rozwijany panel krawędziowy"
+
+-#: ../gnome-panel/panel-toplevel.c:1679
++#: ../gnome-panel/panel-toplevel.c:1670
+ msgid "Right Centered Panel"
+ msgstr "Prawy panel wyśrodkowany"
+
+-#: ../gnome-panel/panel-toplevel.c:1680
++#: ../gnome-panel/panel-toplevel.c:1671
+ msgid "Right Floating Panel"
+ msgstr "Prawy panel oderwany"
+
+-#: ../gnome-panel/panel-toplevel.c:1681
++#: ../gnome-panel/panel-toplevel.c:1672
+ msgid "Right Edge Panel"
+ msgstr "Prawy panel krawędziowy"
+
+-#: ../gnome-panel/panel-util.c:314
++#: ../gnome-panel/panel-util.c:313
+ #, c-format
+ msgid "Icon '%s' not found"
+ msgstr "Nie odnaleziono ikony \"%s\""
+
+-#: ../gnome-panel/panel-util.c:557
++#: ../gnome-panel/panel-util.c:556
+ msgid "file"
+ msgstr "plik"
+
+-#: ../gnome-panel/panel-util.c:734
++#: ../gnome-panel/panel-util.c:731
+ msgid "Home Folder"
+ msgstr "Katalog domowy"
+
+ #. Translators: this is the same string as the one found in
+ #. * nautilus
+-#: ../gnome-panel/panel-util.c:746
++#: ../gnome-panel/panel-util.c:743
+ msgid "File System"
+ msgstr "System plików"
+
+-#: ../gnome-panel/panel-util.c:919
++#: ../gnome-panel/panel-util.c:916
+ msgid "Search"
+ msgstr "Wyszukaj"
+
+@@ -2565,7 +2577,7 @@ msgstr "Wyszukaj"
+ #. * example, "Trash: some-directory". It means that the
+ #. * directory called "some-directory" is in the trash.
+ #.
+-#: ../gnome-panel/panel-util.c:965
++#: ../gnome-panel/panel-util.c:962
+ #, c-format
+ msgid "%1$s: %2$s"
+ msgstr "%1$s: %2$s"
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 2eb9baa..ccb1622 100644
+--- po/pt_BR.po
++++ po/pt_BR.po
+@@ -21,15 +21,16 @@
+ # Jonh Wendell <jwendell@gnome.org>, 2010.
+ # Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
+ # Rafael Ferreira <rafael.f.f1@gmail.com>, 2013.
++# Adorilson Bezerra <adorilson@gmail.com>, 2013.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-panel\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "panel&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-07-02 08:18+0000\n"
+-"PO-Revision-Date: 2013-07-03 20:56-0300\n"
+-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
++"POT-Creation-Date: 2013-12-13 18:25+0000\n"
++"PO-Revision-Date: 2013-12-14 22:18-0300\n"
++"Last-Translator: Adorilson Bezerra <adorilson@gmail.com>\n"
+ "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+ "Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+@@ -79,7 +80,7 @@ msgstr "Tarefas"
+
+ #: ../applets/clock/calendar-window.c:831
+ #: ../applets/clock/calendar-window.c:1014
+-#: ../applets/clock/calendar-window.c:1552
++#: ../applets/clock/calendar-window.c:1550
+ msgid "Edit"
+ msgstr "Editar"
+
+@@ -99,104 +100,104 @@ msgstr "Aniversários e datas especiais"
+ msgid "Weather Information"
+ msgstr "Informações meteorológicas"
+
+-#: ../applets/clock/calendar-window.c:1552 ../applets/clock/clock.ui.h:22
++#: ../applets/clock/calendar-window.c:1550 ../applets/clock/clock.ui.h:22
+ msgid "Locations"
+ msgstr "Locais"
+
+-#: ../applets/clock/calendar-window.c:1807
++#: ../applets/clock/calendar-window.c:1805
+ msgid "Calendar"
+ msgstr "Calendário"
+
+ #. Translators: This is a strftime format string.
+ #. * It is used to display a date. Please leave "%%s" as it is:
+ #. * it will be used to insert the timezone name later.
+-#: ../applets/clock/clock.c:309
++#: ../applets/clock/clock.c:297
+ msgid "%A %B %d (%%s)"
+ msgstr "%A %d %B (%%s)"
+
+-#: ../applets/clock/clock.c:321
++#: ../applets/clock/clock.c:309
+ msgid "Click to hide your appointments and tasks"
+ msgstr "Clique para ocultar seus compromissos e tarefas"
+
+-#: ../applets/clock/clock.c:324
++#: ../applets/clock/clock.c:312
+ msgid "Click to view your appointments and tasks"
+ msgstr "Clique para ver os seus compromissos e tarefas"
+
+-#: ../applets/clock/clock.c:328
++#: ../applets/clock/clock.c:316
+ msgid "Click to hide month calendar"
+ msgstr "Clique para ocultar o calendário do mês"
+
+-#: ../applets/clock/clock.c:331
++#: ../applets/clock/clock.c:319
+ msgid "Click to view month calendar"
+ msgstr "Clique para ver o calendário do mês"
+
+-#: ../applets/clock/clock.c:991
++#: ../applets/clock/clock.c:956
+ msgid "Computer Clock"
+ msgstr "Relógio do computador"
+
+-#: ../applets/clock/clock.c:1170
++#: ../applets/clock/clock.c:1120
+ msgid "Failed to open the time settings"
+ msgstr "Falha ao abrir definições de hora"
+
+-#: ../applets/clock/clock.c:1190 ../applets/fish/fish.c:1307
++#: ../applets/clock/clock.c:1140 ../applets/fish/fish.c:1307
+ #: ../applets/wncklet/window-list.c:155
+ #: ../applets/wncklet/workspace-switcher.c:218
+ msgid "_Preferences"
+ msgstr "_Preferências"
+
+-#: ../applets/clock/clock.c:1193
++#: ../applets/clock/clock.c:1143
+ msgid "Copy Date and _Time"
+ msgstr "Copiar Data e _hora"
+
+-#: ../applets/clock/clock.c:1196
++#: ../applets/clock/clock.c:1146
+ msgid "Ad_just Date & Time"
+ msgstr "A_justar data e hora"
+
+-#: ../applets/clock/clock.c:1767
++#: ../applets/clock/clock.c:1714
+ msgid "Choose Location"
+ msgstr "Escolher local"
+
+-#: ../applets/clock/clock.c:1846
++#: ../applets/clock/clock.c:1793
+ msgid "Edit Location"
+ msgstr "Editar local"
+
+-#: ../applets/clock/clock.c:1880
++#: ../applets/clock/clock.c:1827
+ msgid "Kelvin"
+ msgstr "Kelvin"
+
+-#: ../applets/clock/clock.c:1881
++#: ../applets/clock/clock.c:1828
+ msgid "Celsius"
+ msgstr "Celsius"
+
+-#: ../applets/clock/clock.c:1882
++#: ../applets/clock/clock.c:1829
+ msgid "Fahrenheit"
+ msgstr "Fahrenheit"
+
+-#: ../applets/clock/clock.c:1887
++#: ../applets/clock/clock.c:1834
+ msgid "Meters per second (m/s)"
+ msgstr "Metros por segundo (m/s)"
+
+-#: ../applets/clock/clock.c:1888
++#: ../applets/clock/clock.c:1835
+ msgid "Kilometers per hour (kph)"
+ msgstr "Quilômetros por hora (qph)"
+
+-#: ../applets/clock/clock.c:1889
++#: ../applets/clock/clock.c:1836
+ msgid "Miles per hour (mph)"
+ msgstr "Milhas por hora (mph)"
+
+-#: ../applets/clock/clock.c:1890
++#: ../applets/clock/clock.c:1837
+ msgid "Knots"
+ msgstr "Nós"
+
+-#: ../applets/clock/clock.c:1891
++#: ../applets/clock/clock.c:1838
+ msgid "Beaufort scale"
+ msgstr "Escala Beaufort"
+
+-#: ../applets/clock/clock.c:1944
++#: ../applets/clock/clock.c:1891
+ msgid "City Name"
+ msgstr "Nome da cidade"
+
+-#: ../applets/clock/clock.c:1948
++#: ../applets/clock/clock.c:1895
+ msgid "City Time Zone"
+ msgstr "Fuso horário da cidade"
+
+@@ -372,12 +373,12 @@ msgstr "Meteorologia"
+ msgid "Time _Settings"
+ msgstr "_Configurar hora"
+
+-#: ../applets/clock/clock-utils.c:97 ../applets/fish/fish.c:164
++#: ../applets/clock/clock-utils.c:96 ../applets/fish/fish.c:164
+ #, c-format
+ msgid "Could not display help document '%s'"
+ msgstr "Não foi possível exibir o documento de ajuda \"%s\""
+
+-#: ../applets/clock/clock-utils.c:126 ../applets/fish/fish.c:190
++#: ../applets/clock/clock-utils.c:125 ../applets/fish/fish.c:190
+ msgid "Error displaying help document"
+ msgstr "Não foi possível exibir o documento de ajuda"
+
+@@ -532,7 +533,7 @@ msgstr "Peixe"
+ msgid "Display a swimming fish or another animated creature"
+ msgstr "Exiba um peixe nadando ou uma outra criatura animada"
+
+-#: ../applets/notification_area/main.c:245
++#: ../applets/notification_area/main.c:244
+ msgid "Panel Notification Area"
+ msgstr "Área de notificação do painel"
+
+@@ -571,7 +572,7 @@ msgstr "Alterna entre janelas abertas usando um menu "
+
+ #: ../applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in.h:5
+ msgid "Workspace Switcher"
+-msgstr "Alternador de áreas de trabalho"
++msgstr "Alternador de espaço de trabalho"
+
+ #: ../applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in.h:6
+ msgid "Switch between workspaces"
+@@ -668,13 +669,13 @@ msgid "Restore to na_tive workspace"
+ msgstr "Restaurar no espaço de trabalho _original"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ #: ../applets/wncklet/workspace-switcher.ui.h:4
+ msgid "rows"
+ msgstr "linhas"
+
+ #: ../applets/wncklet/workspace-switcher.c:194
+-#: ../applets/wncklet/workspace-switcher.c:716
++#: ../applets/wncklet/workspace-switcher.c:714
+ msgid "columns"
+ msgstr "colunas"
+
+@@ -714,12 +715,12 @@ msgstr "Mostrar os _nomes dos espaços de trabalho no alternador"
+ msgid "Workspaces"
+ msgstr "Espaços de trabalho"
+
+-#: ../data/gnome-fallback.desktop.in.h:1
++#: ../data/gnome-flashback.desktop.in.in.h:1
+ #: ../data/gnome-flashback.session.desktop.in.h:1
+-msgid "GNOME Flashback"
+-msgstr "GNOME Retrô"
++msgid "GNOME Flashback (Metacity)"
++msgstr "GNOME Retrô (Metacity)"
+
+-#: ../data/gnome-fallback.desktop.in.h:2
++#: ../data/gnome-flashback.desktop.in.in.h:2
+ msgid "This session logs you into GNOME with the traditional panel"
+ msgstr "Inicia sua sessão no GNOME com o painel tradicional"
+
+@@ -1552,29 +1553,29 @@ msgstr "_Mover"
+ msgid "_Remove From Panel"
+ msgstr "_Remover do painel"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:29
++#: ../gnome-panel/gnome-desktop-item-edit.c:27
+ msgid "Create new file in the given directory"
+ msgstr "Cria novo arquivo no diretório especificado"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:30
++#: ../gnome-panel/gnome-desktop-item-edit.c:28
+ msgid "[FILE...]"
+ msgstr "[ARQUIVO...]"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:108
++#: ../gnome-panel/gnome-desktop-item-edit.c:106
+ msgid "- Edit .desktop files"
+ msgstr "- Editar arquivos .desktop"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:146
+-#: ../gnome-panel/gnome-desktop-item-edit.c:200 ../gnome-panel/launcher.c:892
++#: ../gnome-panel/gnome-desktop-item-edit.c:144
++#: ../gnome-panel/gnome-desktop-item-edit.c:198 ../gnome-panel/launcher.c:894
+ msgid "Create Launcher"
+ msgstr "Criar lançador"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:171
+-#: ../gnome-panel/gnome-desktop-item-edit.c:194
++#: ../gnome-panel/gnome-desktop-item-edit.c:169
++#: ../gnome-panel/gnome-desktop-item-edit.c:192
+ msgid "Directory Properties"
+ msgstr "Propriedades do diretório"
+
+-#: ../gnome-panel/gnome-desktop-item-edit.c:177 ../gnome-panel/launcher.c:732
++#: ../gnome-panel/gnome-desktop-item-edit.c:175 ../gnome-panel/launcher.c:732
+ msgid "Launcher Properties"
+ msgstr "Propriedades do lançador"
+
+@@ -1618,24 +1619,24 @@ msgid "Unable to open desktop file %s for panel launcher%s%s\n"
+ msgstr ""
+ "Não foi possível abrir o arquivo desktop %s para o lançador do painel%s%s\n"
+
+-#: ../gnome-panel/launcher.c:796
++#: ../gnome-panel/launcher.c:798
+ msgid "_Launch"
+ msgstr "_Lançar"
+
+-#: ../gnome-panel/launcher.c:802 ../gnome-panel/panel-action-button.c:139
++#: ../gnome-panel/launcher.c:804 ../gnome-panel/panel-action-button.c:172
+ #: ../gnome-panel/panel-context-menu.c:133
+ msgid "_Properties"
+ msgstr "_Propriedades"
+
+-#: ../gnome-panel/launcher.c:833
++#: ../gnome-panel/launcher.c:835
+ #, c-format
+ msgid "Launcher location is not set, cannot load launcher\n"
+ msgstr ""
+ "A localização do lançador não está definida, impossível carregar o lançador\n"
+
+-#: ../gnome-panel/launcher.c:963 ../gnome-panel/panel-ditem-editor.c:1352
+-#: ../gnome-panel/panel-ditem-editor.c:1386
+-#: ../gnome-panel/panel-ditem-editor.c:1417
++#: ../gnome-panel/launcher.c:965 ../gnome-panel/panel-ditem-editor.c:1317
++#: ../gnome-panel/panel-ditem-editor.c:1351
++#: ../gnome-panel/panel-ditem-editor.c:1382
+ msgid "Could not save launcher"
+ msgstr "Não foi possível salvar lançador"
+
+@@ -1737,80 +1738,80 @@ msgstr "Nenhum aplicativo para manipular pesquisas de pastas está instalado."
+ msgid "Replace a currently running panel"
+ msgstr "Substituir o painel atualmente em execução"
+
+-#: ../gnome-panel/panel-action-button.c:127
++#: ../gnome-panel/panel-action-button.c:160
+ msgid "_Lock Screen"
+ msgstr "Blo_quear tela"
+
+-#: ../gnome-panel/panel-action-button.c:133
++#: ../gnome-panel/panel-action-button.c:166
+ msgid "_Activate Screensaver"
+ msgstr "_Ativar proteção de tela"
+
+-#: ../gnome-panel/panel-action-button.c:239
++#: ../gnome-panel/panel-action-button.c:272
+ msgid "Connect to server"
+ msgstr "Conectar ao servidor"
+
+-#: ../gnome-panel/panel-action-button.c:263
++#: ../gnome-panel/panel-action-button.c:296
+ msgid "Could not connect to server"
+ msgstr "Não foi possível se conectar ao servidor"
+
+-#: ../gnome-panel/panel-action-button.c:293
++#: ../gnome-panel/panel-action-button.c:326
+ msgid "Lock Screen"
+ msgstr "Bloquear tela"
+
+-#: ../gnome-panel/panel-action-button.c:294
++#: ../gnome-panel/panel-action-button.c:327
+ msgid "Protect your computer from unauthorized use"
+ msgstr "Proteja seu computador de uso não autorizado"
+
+ #. when changing one of those two strings, don't forget to
+ #. * update the ones in panel-menu-items.c (look for
+ #. * "1" (msgctxt: "panel:showusername"))
+-#: ../gnome-panel/panel-action-button.c:307
++#: ../gnome-panel/panel-action-button.c:340
+ msgid "Log Out"
+ msgstr "Encerrar sessão"
+
+-#: ../gnome-panel/panel-action-button.c:308
++#: ../gnome-panel/panel-action-button.c:341
+ msgid "Log out of this session to log in as a different user"
+ msgstr "Encerre essa sessão para entrar como um usuário diferente"
+
+-#: ../gnome-panel/panel-action-button.c:316
++#: ../gnome-panel/panel-action-button.c:349
+ msgid "Run Application..."
+ msgstr "Executar aplicativo..."
+
+-#: ../gnome-panel/panel-action-button.c:317
++#: ../gnome-panel/panel-action-button.c:350
+ msgid "Run an application by typing a command or choosing from a list"
+ msgstr "Execute um aplicativo digitando um comando ou escolhendo de uma lista"
+
+-#: ../gnome-panel/panel-action-button.c:325
++#: ../gnome-panel/panel-action-button.c:358
+ msgid "Search for Files..."
+ msgstr "Pesquisar arquivos..."
+
+-#: ../gnome-panel/panel-action-button.c:326
++#: ../gnome-panel/panel-action-button.c:359
+ msgid "Locate documents and folders on this computer by name or content"
+ msgstr "Localize documentos e pastas neste computador por nome ou conteúdo"
+
+-#: ../gnome-panel/panel-action-button.c:333
++#: ../gnome-panel/panel-action-button.c:366
+ #: ../gnome-panel/panel-force-quit.c:241
+ msgid "Force Quit"
+ msgstr "Fechar forçado"
+
+-#: ../gnome-panel/panel-action-button.c:334
++#: ../gnome-panel/panel-action-button.c:367
+ msgid "Force a misbehaving application to quit"
+ msgstr "Force um aplicativo mal comportado a sair"
+
+ #. FIXME icon
+-#: ../gnome-panel/panel-action-button.c:342
++#: ../gnome-panel/panel-action-button.c:375
+ msgid "Connect to Server..."
+ msgstr "Conectar ao servidor..."
+
+-#: ../gnome-panel/panel-action-button.c:343
++#: ../gnome-panel/panel-action-button.c:376
+ msgid "Connect to a remote computer or shared disk"
+ msgstr "Conecte-se a um servidor remoto ou disco partilhado"
+
+-#: ../gnome-panel/panel-action-button.c:350
++#: ../gnome-panel/panel-action-button.c:383
+ msgid "Power Off"
+ msgstr "Desligar"
+
+-#: ../gnome-panel/panel-action-button.c:351
++#: ../gnome-panel/panel-action-button.c:384
+ msgid "Power off the computer"
+ msgstr "Desligue o computador"
+
+@@ -1919,7 +1920,7 @@ msgid "Open URL: %s"
+ msgstr "Abre o URL: %s"
+
+ #. Translators: %s is a URI
+-#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:645
++#: ../gnome-panel/panel.c:596 ../gnome-panel/panel-menu-items.c:640
+ #, c-format
+ msgid "Open '%s'"
+ msgstr "Abre \"%s\""
+@@ -1927,30 +1928,30 @@ msgstr "Abre \"%s\""
+ #. is_exec?
+ #. exec
+ #. name
+-#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1200
++#: ../gnome-panel/panel.c:644 ../gnome-panel/panel-menu-items.c:1194
+ msgid "Open your personal folder"
+ msgstr "Abre sua pasta pessoal"
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1236
++#: ../gnome-panel/panel.c:653 ../gnome-panel/panel-menu-items.c:1223
+ msgid "Computer"
+ msgstr "Computador"
+
+ #. name
+-#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1242
++#: ../gnome-panel/panel.c:654 ../gnome-panel/panel-menu-items.c:1224
+ msgid ""
+ "Browse all local and remote disks and folders accessible from this computer"
+ msgstr "Navega em todos os discos e pastas locais e remotas deste computador"
+
+ #. is_exec?
+ #. exec
+-#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1252
++#: ../gnome-panel/panel.c:661 ../gnome-panel/panel-menu-items.c:1233
+ msgid "Network"
+ msgstr "Rede"
+
+ #. name
+-#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1253
++#: ../gnome-panel/panel.c:662 ../gnome-panel/panel-menu-items.c:1234
+ msgid "Browse bookmarked and local network locations"
+ msgstr "Navega nos locais favoritos e locais da rede"
+
+@@ -1999,58 +2000,58 @@ msgid "Location"
+ msgstr "Localização"
+
+ #. Type
+-#: ../gnome-panel/panel-ditem-editor.c:616
++#: ../gnome-panel/panel-ditem-editor.c:602
+ msgid "_Type:"
+ msgstr "_Tipo:"
+
+ #. Name
+-#: ../gnome-panel/panel-ditem-editor.c:623
++#: ../gnome-panel/panel-ditem-editor.c:609
+ msgid "_Name:"
+ msgstr "_Nome:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:650
++#: ../gnome-panel/panel-ditem-editor.c:634
+ msgid "_Browse..."
+ msgstr "_Navegar..."
+
+ #. Comment
+-#: ../gnome-panel/panel-ditem-editor.c:657
++#: ../gnome-panel/panel-ditem-editor.c:641
+ msgid "Co_mment:"
+ msgstr "Co_mentário:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1003
++#: ../gnome-panel/panel-ditem-editor.c:968
+ msgid "Choose an application..."
+ msgstr "Escolha um aplicativo..."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1007
++#: ../gnome-panel/panel-ditem-editor.c:972
+ msgid "Choose a file..."
+ msgstr "Escolha um arquivo..."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1172
+-#: ../gnome-panel/panel-ditem-editor.c:1181
++#: ../gnome-panel/panel-ditem-editor.c:1137
++#: ../gnome-panel/panel-ditem-editor.c:1146
+ msgid "Comm_and:"
+ msgstr "Co_mando:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1190
++#: ../gnome-panel/panel-ditem-editor.c:1155
+ msgid "_Location:"
+ msgstr "_Localização:"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1353
++#: ../gnome-panel/panel-ditem-editor.c:1318
+ msgid "The name of the launcher is not set."
+ msgstr "O nome do lançador não está definido."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1357
++#: ../gnome-panel/panel-ditem-editor.c:1322
+ msgid "Could not save directory properties"
+ msgstr "Não foi possível salvar as propriedades do diretório"
+
+-#: ../gnome-panel/panel-ditem-editor.c:1358
++#: ../gnome-panel/panel-ditem-editor.c:1323
+ msgid "The name of the directory is not set."
+ msgstr "O nome do diretório não está definido."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1374
++#: ../gnome-panel/panel-ditem-editor.c:1339
+ msgid "The command of the launcher is not set."
+ msgstr "O comando do lançador não está definido."
+
+-#: ../gnome-panel/panel-ditem-editor.c:1377
++#: ../gnome-panel/panel-ditem-editor.c:1342
+ msgid "The location of the launcher is not set."
+ msgstr "A localização do lançador não está definida."
+
+@@ -2073,7 +2074,7 @@ msgstr ""
+ "Se você escolher forçar um aplicativo a sair, qualquer mudança não salva em "
+ "algum documento aberto será perdida."
+
+-#: ../gnome-panel/panel-layout.c:1197 ../gnome-panel/panel-layout.c:1211
++#: ../gnome-panel/panel-layout.c:1219 ../gnome-panel/panel-layout.c:1233
+ #, c-format
+ msgid "Cannot create initial panel layout.\n"
+ msgstr "Não foi possível criar a disposição inicial do painel.\n"
+@@ -2094,63 +2095,63 @@ msgstr "Aplicativos"
+ msgid "_Edit Menus"
+ msgstr "_Editar menus"
+
+-#: ../gnome-panel/panel-menu-items.c:491
++#: ../gnome-panel/panel-menu-items.c:486
+ msgid "Switch User"
+ msgstr "Alternar usuário"
+
+-#: ../gnome-panel/panel-menu-items.c:621
++#: ../gnome-panel/panel-menu-items.c:616
+ msgid "Bookmarks"
+ msgstr "Marcadores"
+
+-#: ../gnome-panel/panel-menu-items.c:716
++#: ../gnome-panel/panel-menu-items.c:711
+ #, c-format
+ msgid "Unable to scan %s for media changes"
+ msgstr "Não foi possível varrer %s por alterações na mídia"
+
+-#: ../gnome-panel/panel-menu-items.c:758
++#: ../gnome-panel/panel-menu-items.c:753
+ #, c-format
+ msgid "Rescan %s"
+ msgstr "Varrer novamente %s"
+
+-#: ../gnome-panel/panel-menu-items.c:795
++#: ../gnome-panel/panel-menu-items.c:790
+ #, c-format
+ msgid "Unable to mount %s"
+ msgstr "Não foi possível montar %s"
+
+-#: ../gnome-panel/panel-menu-items.c:857
++#: ../gnome-panel/panel-menu-items.c:852
+ #, c-format
+ msgid "Mount %s"
+ msgstr "Montar %s"
+
+-#: ../gnome-panel/panel-menu-items.c:1065
++#: ../gnome-panel/panel-menu-items.c:1060
+ msgid "Removable Media"
+ msgstr "Mídia removível"
+
+-#: ../gnome-panel/panel-menu-items.c:1156
++#: ../gnome-panel/panel-menu-items.c:1151
+ msgid "Network Places"
+ msgstr "Locais de rede"
+
+ #. Translators: Desktop is used here as in
+ #. * "Desktop Folder" (this is not the Desktop
+ #. * environment).
+-#: ../gnome-panel/panel-menu-items.c:1220
++#: ../gnome-panel/panel-menu-items.c:1211
+ msgctxt "Desktop Folder"
+ msgid "Desktop"
+ msgstr "Mostrar área de trabalho"
+
+-#: ../gnome-panel/panel-menu-items.c:1221
++#: ../gnome-panel/panel-menu-items.c:1212
+ msgid "Open the contents of your desktop in a folder"
+ msgstr "Abra a área de trabalho como uma pasta"
+
+-#: ../gnome-panel/panel-menu-items.c:1358
++#: ../gnome-panel/panel-menu-items.c:1336
+ msgid "Available"
+ msgstr "Disponível"
+
+-#: ../gnome-panel/panel-menu-items.c:1368
++#: ../gnome-panel/panel-menu-items.c:1346
+ msgid "Busy"
+ msgstr "Ocupado"
+
+-#: ../gnome-panel/panel-menu-items.c:1621
++#: ../gnome-panel/panel-menu-items.c:1578
+ msgid "Places"
+ msgstr "Locais"
+
+@@ -2502,90 +2503,90 @@ msgstr "Ocultar painel"
+
+ #. translators: these string will be shown in MetaCity's switch window
+ #. * popup when you pass the focus to a panel
+-#: ../gnome-panel/panel-toplevel.c:1657
++#: ../gnome-panel/panel-toplevel.c:1648
+ msgid "Top Expanded Edge Panel"
+ msgstr "Painel de canto superior estendido"
+
+-#: ../gnome-panel/panel-toplevel.c:1658
++#: ../gnome-panel/panel-toplevel.c:1649
+ msgid "Top Centered Panel"
+ msgstr "Painel central superior"
+
+-#: ../gnome-panel/panel-toplevel.c:1659
++#: ../gnome-panel/panel-toplevel.c:1650
+ msgid "Top Floating Panel"
+ msgstr "Painel flutuante superior"
+
+-#: ../gnome-panel/panel-toplevel.c:1660
++#: ../gnome-panel/panel-toplevel.c:1651
+ msgid "Top Edge Panel"
+ msgstr "Painel de canto superior"
+
+-#: ../gnome-panel/panel-toplevel.c:1664
++#: ../gnome-panel/panel-toplevel.c:1655
+ msgid "Bottom Expanded Edge Panel"
+ msgstr "Painel de canto inferior expandido"
+
+-#: ../gnome-panel/panel-toplevel.c:1665
++#: ../gnome-panel/panel-toplevel.c:1656
+ msgid "Bottom Centered Panel"
+ msgstr "Painel central inferior"
+
+-#: ../gnome-panel/panel-toplevel.c:1666
++#: ../gnome-panel/panel-toplevel.c:1657
+ msgid "Bottom Floating Panel"
+ msgstr "Painel flutuante inferior"
+
+-#: ../gnome-panel/panel-toplevel.c:1667
++#: ../gnome-panel/panel-toplevel.c:1658
+ msgid "Bottom Edge Panel"
+ msgstr "Painel de canto inferior"
+
+-#: ../gnome-panel/panel-toplevel.c:1671
++#: ../gnome-panel/panel-toplevel.c:1662
+ msgid "Left Expanded Edge Panel"
+ msgstr "Painel de canto esquerdo expandido"
+
+-#: ../gnome-panel/panel-toplevel.c:1672
++#: ../gnome-panel/panel-toplevel.c:1663
+ msgid "Left Centered Panel"
+ msgstr "Painel central esquerdo"
+
+-#: ../gnome-panel/panel-toplevel.c:1673
++#: ../gnome-panel/panel-toplevel.c:1664
+ msgid "Left Floating Panel"
+ msgstr "Painel flutuante esquerdo"
+
+-#: ../gnome-panel/panel-toplevel.c:1674
++#: ../gnome-panel/panel-toplevel.c:1665
+ msgid "Left Edge Panel"
+ msgstr "Painel de canto esquerdo"
+
+-#: ../gnome-panel/panel-toplevel.c:1678
++#: ../gnome-panel/panel-toplevel.c:1669
+ msgid "Right Expanded Edge Panel"
+ msgstr "Painel de canto direito expandido"
+
+-#: ../gnome-panel/panel-toplevel.c:1679
++#: ../gnome-panel/panel-toplevel.c:1670
+ msgid "Right Centered Panel"
+ msgstr "Painel central direito"
+
+-#: ../gnome-panel/panel-toplevel.c:1680
++#: ../gnome-panel/panel-toplevel.c:1671
+ msgid "Right Floating Panel"
+ msgstr "Painel flutuante direito"
+
+-#: ../gnome-panel/panel-toplevel.c:1681
++#: ../gnome-panel/panel-toplevel.c:1672
+ msgid "Right Edge Panel"
+ msgstr "Painel de canto direito"
+
+-#: ../gnome-panel/panel-util.c:314
++#: ../gnome-panel/panel-util.c:313
+ #, c-format
+ msgid "Icon '%s' not found"
+ msgstr "Ícone \"%s\" não localizado"
+
+-#: ../gnome-panel/panel-util.c:557
++#: ../gnome-panel/panel-util.c:556
+ msgid "file"
+ msgstr "arquivo"
+
+-#: ../gnome-panel/panel-util.c:734
++#: ../gnome-panel/panel-util.c:731
+ msgid "Home Folder"
+ msgstr "Pasta pessoal"
+
+ #. Translators: this is the same string as the one found in
+ #. * nautilus
+-#: ../gnome-panel/panel-util.c:746
++#: ../gnome-panel/panel-util.c:743
+ msgid "File System"
+ msgstr "Sistema de arquivos"
+
+-#: ../gnome-panel/panel-util.c:919
++#: ../gnome-panel/panel-util.c:916
+ msgid "Search"
+ msgstr "Pesquisar"
+
+@@ -2594,7 +2595,7 @@ msgstr "Pesquisar"
+ #. * example, "Trash: some-directory". It means that the
+ #. * directory called "some-directory" is in the trash.
+ #.
+-#: ../gnome-panel/panel-util.c:965
++#: ../gnome-panel/panel-util.c:962
+ #, c-format
+ msgid "%1$s: %2$s"
+ msgstr "%1$s: %2$s"
+diff --git a/po/sr.po b/po/sr.po
+index 6db7ec3..f818c1f 100644
+--- po/sr.po
++++ po/sr.po
+@@ -5,8 +5,8 @@ msgstr ""
+ "Project-Id-Version: gnome-panel\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "panel&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-03-08 18:02+0000\n"
+-"PO-Revision-Date: 2013-04-02 08:50+0200\n"
++"POT-Creation-Date: 2013-09-27 22:11+0000\n"
++"PO-Revision-Date: 2013-10-11 10:49+0200\n"
+ "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+ "Language-Team: Serbian <gnom@prevod.org>\n"
+ "Language: sr\n"
+@@ -699,6 +699,15 @@ msgstr "Прикажи _називе радних простора у преба
+ msgid "Workspaces"
+ msgstr "Радни простори"
+
++#: ../data/gnome-flashback.desktop.in.in.h:1
++#: ../data/gnome-flashback.session.desktop.in.h:1
++msgid "GNOME Flashback"
++msgstr "Стари Гном"
++
++#: ../data/gnome-flashback.desktop.in.in.h:2
++msgid "This session logs you into GNOME with the traditional panel"
++msgstr "Ова сесија вас пријављује у Гном са традиционалним панелом"
++
+ #: ../data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in.h:1
+ msgid "Show date in tooltip"
+ msgstr "Приказ датума у облачићу"
+@@ -1746,7 +1755,7 @@ msgstr ""
+ "Пронађите документе и фасцикле на овом рачунару према називу или садржају"
+
+ #: ../gnome-panel/panel-action-button.c:333
+-#: ../gnome-panel/panel-force-quit.c:239
++#: ../gnome-panel/panel-force-quit.c:241
+ msgid "Force Quit"
+ msgstr "Приморај затварање"
+
+@@ -2012,18 +2021,18 @@ msgstr "Наредба коју овај покретач извршава ни
+ msgid "The location of the launcher is not set."
+ msgstr "Место у коме се покретач извршава није постављено."
+
+-#: ../gnome-panel/panel-force-quit.c:77
++#: ../gnome-panel/panel-force-quit.c:79
+ msgid ""
+ "Click on a window to force the application to quit. To cancel press <ESC>."
+ msgstr ""
+ "Кликните на прозор да приморате програм да изађе. Да откажете, притисните "
+ "<ESC>."
+
+-#: ../gnome-panel/panel-force-quit.c:222
++#: ../gnome-panel/panel-force-quit.c:224
+ msgid "Force this application to exit?"
+ msgstr "Да приморам овај програм на затварање?"
+
+-#: ../gnome-panel/panel-force-quit.c:225
++#: ../gnome-panel/panel-force-quit.c:227
+ msgid ""
+ "If you choose to force an application to exit, unsaved changes in any open "
+ "documents in it might get lost."
+@@ -2031,7 +2040,7 @@ msgstr ""
+ "Ако одлучите да приморате затварање овог програма, можете изгубити "
+ "несачуване документе."
+
+-#: ../gnome-panel/panel-layout.c:1197 ../gnome-panel/panel-layout.c:1211
++#: ../gnome-panel/panel-layout.c:1189 ../gnome-panel/panel-layout.c:1203
+ #, c-format
+ msgid "Cannot create initial panel layout.\n"
+ msgstr "Не могу да направим почетни распоред панела.\n"
+@@ -2450,73 +2459,73 @@ msgstr "_Програмче:"
+ msgid "_Prefs Dir:"
+ msgstr "_Поставке:"
+
+-#: ../gnome-panel/panel-toplevel.c:1272
++#: ../gnome-panel/panel-toplevel.c:1273
+ msgid "Hide Panel"
+ msgstr "Сакриј панел"
+
+ #. translators: these string will be shown in MetaCity's switch window
+ #. * popup when you pass the focus to a panel
+-#: ../gnome-panel/panel-toplevel.c:1657
++#: ../gnome-panel/panel-toplevel.c:1658
+ msgid "Top Expanded Edge Panel"
+ msgstr "Горњи раширени ивични панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1658
++#: ../gnome-panel/panel-toplevel.c:1659
+ msgid "Top Centered Panel"
+ msgstr "Горњи панел по средини"
+
+-#: ../gnome-panel/panel-toplevel.c:1659
++#: ../gnome-panel/panel-toplevel.c:1660
+ msgid "Top Floating Panel"
+ msgstr "Горњи плутајући панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1660
++#: ../gnome-panel/panel-toplevel.c:1661
+ msgid "Top Edge Panel"
+ msgstr "Горњи ивични панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1664
++#: ../gnome-panel/panel-toplevel.c:1665
+ msgid "Bottom Expanded Edge Panel"
+ msgstr "Доњи раширени ивични панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1665
++#: ../gnome-panel/panel-toplevel.c:1666
+ msgid "Bottom Centered Panel"
+ msgstr "Доњи панел по средини"
+
+-#: ../gnome-panel/panel-toplevel.c:1666
++#: ../gnome-panel/panel-toplevel.c:1667
+ msgid "Bottom Floating Panel"
+ msgstr "Доњи плутајући панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1667
++#: ../gnome-panel/panel-toplevel.c:1668
+ msgid "Bottom Edge Panel"
+ msgstr "Доњи ивични панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1671
++#: ../gnome-panel/panel-toplevel.c:1672
+ msgid "Left Expanded Edge Panel"
+ msgstr "Леви раширени ивични панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1672
++#: ../gnome-panel/panel-toplevel.c:1673
+ msgid "Left Centered Panel"
+ msgstr "Леви панел по средини"
+
+-#: ../gnome-panel/panel-toplevel.c:1673
++#: ../gnome-panel/panel-toplevel.c:1674
+ msgid "Left Floating Panel"
+ msgstr "Леви плутајући панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1674
++#: ../gnome-panel/panel-toplevel.c:1675
+ msgid "Left Edge Panel"
+ msgstr "Леви ивични панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1678
++#: ../gnome-panel/panel-toplevel.c:1679
+ msgid "Right Expanded Edge Panel"
+ msgstr "Десни раширени ивични панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1679
++#: ../gnome-panel/panel-toplevel.c:1680
+ msgid "Right Centered Panel"
+ msgstr "Десни панел по средини"
+
+-#: ../gnome-panel/panel-toplevel.c:1680
++#: ../gnome-panel/panel-toplevel.c:1681
+ msgid "Right Floating Panel"
+ msgstr "Десни плутајући панел"
+
+-#: ../gnome-panel/panel-toplevel.c:1681
++#: ../gnome-panel/panel-toplevel.c:1682
+ msgid "Right Edge Panel"
+ msgstr "десни ивични панел"
+
+diff --git a/po/sr@latin.po b/po/sr@latin.po
+index a750e0e..8dcb724 100644
+--- po/sr@latin.po
++++ po/sr@latin.po
+@@ -5,8 +5,8 @@ msgstr ""
+ "Project-Id-Version: gnome-panel\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+ "panel&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-03-08 18:02+0000\n"
+-"PO-Revision-Date: 2013-04-02 08:50+0200\n"
++"POT-Creation-Date: 2013-09-27 22:11+0000\n"
++"PO-Revision-Date: 2013-10-11 10:49+0200\n"
+ "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+ "Language-Team: Serbian <gnom@prevod.org>\n"
+ "Language: sr\n"
+@@ -699,6 +699,15 @@ msgstr "Prikaži _nazive radnih prostora u prebacivaču"
+ msgid "Workspaces"
+ msgstr "Radni prostori"
+
++#: ../data/gnome-flashback.desktop.in.in.h:1
++#: ../data/gnome-flashback.session.desktop.in.h:1
++msgid "GNOME Flashback"
++msgstr "Stari Gnom"
++
++#: ../data/gnome-flashback.desktop.in.in.h:2
++msgid "This session logs you into GNOME with the traditional panel"
++msgstr "Ova sesija vas prijavljuje u Gnom sa tradicionalnim panelom"
++
+ #: ../data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in.h:1
+ msgid "Show date in tooltip"
+ msgstr "Prikaz datuma u oblačiću"
+@@ -1746,7 +1755,7 @@ msgstr ""
+ "Pronađite dokumente i fascikle na ovom računaru prema nazivu ili sadržaju"
+
+ #: ../gnome-panel/panel-action-button.c:333
+-#: ../gnome-panel/panel-force-quit.c:239
++#: ../gnome-panel/panel-force-quit.c:241
+ msgid "Force Quit"
+ msgstr "Primoraj zatvaranje"
+
+@@ -2012,18 +2021,18 @@ msgstr "Naredba koju ovaj pokretač izvršava nije postavljena."
+ msgid "The location of the launcher is not set."
+ msgstr "Mesto u kome se pokretač izvršava nije postavljeno."
+
+-#: ../gnome-panel/panel-force-quit.c:77
++#: ../gnome-panel/panel-force-quit.c:79
+ msgid ""
+ "Click on a window to force the application to quit. To cancel press <ESC>."
+ msgstr ""
+ "Kliknite na prozor da primorate program da izađe. Da otkažete, pritisnite "
+ "<ESC>."
+
+-#: ../gnome-panel/panel-force-quit.c:222
++#: ../gnome-panel/panel-force-quit.c:224
+ msgid "Force this application to exit?"
+ msgstr "Da primoram ovaj program na zatvaranje?"
+
+-#: ../gnome-panel/panel-force-quit.c:225
++#: ../gnome-panel/panel-force-quit.c:227
+ msgid ""
+ "If you choose to force an application to exit, unsaved changes in any open "
+ "documents in it might get lost."
+@@ -2031,7 +2040,7 @@ msgstr ""
+ "Ako odlučite da primorate zatvaranje ovog programa, možete izgubiti "
+ "nesačuvane dokumente."
+
+-#: ../gnome-panel/panel-layout.c:1197 ../gnome-panel/panel-layout.c:1211
++#: ../gnome-panel/panel-layout.c:1189 ../gnome-panel/panel-layout.c:1203
+ #, c-format
+ msgid "Cannot create initial panel layout.\n"
+ msgstr "Ne mogu da napravim početni raspored panela.\n"
+@@ -2450,73 +2459,73 @@ msgstr "_Programče:"
+ msgid "_Prefs Dir:"
+ msgstr "_Postavke:"
+
+-#: ../gnome-panel/panel-toplevel.c:1272
++#: ../gnome-panel/panel-toplevel.c:1273
+ msgid "Hide Panel"
+ msgstr "Sakrij panel"
+
+ #. translators: these string will be shown in MetaCity's switch window
+ #. * popup when you pass the focus to a panel
+-#: ../gnome-panel/panel-toplevel.c:1657
++#: ../gnome-panel/panel-toplevel.c:1658
+ msgid "Top Expanded Edge Panel"
+ msgstr "Gornji rašireni ivični panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1658
++#: ../gnome-panel/panel-toplevel.c:1659
+ msgid "Top Centered Panel"
+ msgstr "Gornji panel po sredini"
+
+-#: ../gnome-panel/panel-toplevel.c:1659
++#: ../gnome-panel/panel-toplevel.c:1660
+ msgid "Top Floating Panel"
+ msgstr "Gornji plutajući panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1660
++#: ../gnome-panel/panel-toplevel.c:1661
+ msgid "Top Edge Panel"
+ msgstr "Gornji ivični panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1664
++#: ../gnome-panel/panel-toplevel.c:1665
+ msgid "Bottom Expanded Edge Panel"
+ msgstr "Donji rašireni ivični panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1665
++#: ../gnome-panel/panel-toplevel.c:1666
+ msgid "Bottom Centered Panel"
+ msgstr "Donji panel po sredini"
+
+-#: ../gnome-panel/panel-toplevel.c:1666
++#: ../gnome-panel/panel-toplevel.c:1667
+ msgid "Bottom Floating Panel"
+ msgstr "Donji plutajući panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1667
++#: ../gnome-panel/panel-toplevel.c:1668
+ msgid "Bottom Edge Panel"
+ msgstr "Donji ivični panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1671
++#: ../gnome-panel/panel-toplevel.c:1672
+ msgid "Left Expanded Edge Panel"
+ msgstr "Levi rašireni ivični panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1672
++#: ../gnome-panel/panel-toplevel.c:1673
+ msgid "Left Centered Panel"
+ msgstr "Levi panel po sredini"
+
+-#: ../gnome-panel/panel-toplevel.c:1673
++#: ../gnome-panel/panel-toplevel.c:1674
+ msgid "Left Floating Panel"
+ msgstr "Levi plutajući panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1674
++#: ../gnome-panel/panel-toplevel.c:1675
+ msgid "Left Edge Panel"
+ msgstr "Levi ivični panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1678
++#: ../gnome-panel/panel-toplevel.c:1679
+ msgid "Right Expanded Edge Panel"
+ msgstr "Desni rašireni ivični panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1679
++#: ../gnome-panel/panel-toplevel.c:1680
+ msgid "Right Centered Panel"
+ msgstr "Desni panel po sredini"
+
+-#: ../gnome-panel/panel-toplevel.c:1680
++#: ../gnome-panel/panel-toplevel.c:1681
+ msgid "Right Floating Panel"
+ msgstr "Desni plutajući panel"
+
+-#: ../gnome-panel/panel-toplevel.c:1681
++#: ../gnome-panel/panel-toplevel.c:1682
+ msgid "Right Edge Panel"
+ msgstr "desni ivični panel"
+
</ins></span></pre>
</div>
</div>
</body>
</html>