date:20080831

[Xfce4-commits] r27627 - xfconf/trunk/xfconfd

2008-08-31 Thread Brian Tarricone

Author: kelnos
Date: 2008-08-31 07:41:38 + (Sun, 31 Aug 2008)
New Revision: 27627

Modified:
   xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
Log:
fix fetching properties rooted at something other than /

Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-08-31 
04:26:10 UTC (rev 27626)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c2008-08-31 
07:41:38 UTC (rev 27627)
@@ -382,20 +382,22 @@
 
 if(G_VALUE_TYPE(&prop->value)) {
 GValue *value = g_new0(GValue, 1);
+gchar *fullprop;
 
 g_value_copy(&prop->value, g_value_init(value,
 G_VALUE_TYPE(&prop->value)));
-g_hash_table_insert(props_hash,
-g_strconcat(cur_path, "/", prop->name, NULL),
-value);
+fullprop = g_strconcat(cur_path, "/", prop->name, NULL);
+g_hash_table_insert(props_hash, fullprop, value);
 }
 
 if(node->children) {
 GNode *cur;
 gchar *p;
 
-g_strlcat(cur_path, "/", MAX_PROP_PATH);
-g_strlcat(cur_path, prop->name, MAX_PROP_PATH);
+if(prop->name[0] != '/') {
+g_strlcat(cur_path, "/", MAX_PROP_PATH);
+g_strlcat(cur_path, prop->name, MAX_PROP_PATH);
+}
 
 for(cur = g_node_first_child(node);
 cur;
@@ -418,8 +420,8 @@
   GError **error)
 {
 XfconfBackendPerchannelXml *xbpx = XFCONF_BACKEND_PERCHANNEL_XML(backend);
-GNode *props_tree = g_tree_lookup(xbpx->channels, channel), *cur;
-gchar cur_path[MAX_PROP_PATH];
+GNode *props_tree = g_tree_lookup(xbpx->channels, channel);
+gchar cur_path[MAX_PROP_PATH], *p;
 
 if(!props_tree) {
 props_tree = xfconf_backend_perchannel_xml_load_channel(xbpx, channel,
@@ -430,8 +432,8 @@
 
 if(property_base[0] && property_base[1]) {
 /* it's not "" or "/" */
-cur = xfconf_proptree_lookup_node(props_tree, property_base);
-if(!cur) {
+props_tree = xfconf_proptree_lookup_node(props_tree, property_base);
+if(!props_tree) {
 if(error) {
 g_set_error(error, XFCONF_ERROR, 
XFCONF_ERROR_PROPERTY_NOT_FOUND,
  _("Property \"%s\" does not exist on channel 
\"%s\""),
@@ -441,19 +443,12 @@
 }
 
 g_strlcpy(cur_path, property_base, sizeof(cur_path));
-xfconf_proptree_node_to_hash_table(cur, properties, cur_path);
-} else {
-/* need to hit each child directly to avoid having a
- * double '/' at the beginning of each prop */
-for(cur = g_node_first_child(props_tree);
-cur;
-cur = g_node_next_sibling(cur))
-{
-cur_path[0] = 0;
-xfconf_proptree_node_to_hash_table(cur, properties, cur_path);
-}
-}
+p = g_strrstr(cur_path, "/");  /* guaranteed to succeed */
+*p = 0;
+} else
+cur_path[0] = 0;
 
+xfconf_proptree_node_to_hash_table(props_tree, properties, cur_path);
 
 return TRUE;
 }

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27628 - in xfce4-settings/trunk: . dialogs/keyboard-settings

2008-08-31 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-31 13:38:18 + (Sun, 31 Aug 2008)
New Revision: 27628

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
Log:
* dialogs/keyboard-settings/shortcut-dialog.c: Ignore
  GDK_SUPER_MASK, GDK_HYPER_MASK and GDK_META_MASK when parsing
  key release events. xfce4-settings-helper handles X events
  instead of Gdk events and unlike Gdk X doesn't know which
  of the Super, Meta and Hyper keys are mapped to Mod2-Mod5.
  Having , ,  or even Super_L in the
  accelerator name will cause the saved shortcut names to be
  different than the ones generated by parsing X key events.
  This should fix bug #4304 although I suppose it would be
  nicer to determine which keys are mapped to Mod2-Mod5 when
  parsing X key events from the semantic point of view.


Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-08-31 07:41:38 UTC (rev 27627)
+++ xfce4-settings/trunk/ChangeLog  2008-08-31 13:38:18 UTC (rev 27628)
@@ -1,3 +1,17 @@
+2008-08-31 Jannis Pohlmann <[EMAIL PROTECTED]>
+
+   * dialogs/keyboard-settings/shortcut-dialog.c: Ignore
+ GDK_SUPER_MASK, GDK_HYPER_MASK and GDK_META_MASK when parsing
+ key release events. xfce4-settings-helper handles X events
+ instead of Gdk events and unlike Gdk X doesn't know which 
+ of the Super, Meta and Hyper keys are mapped to Mod2-Mod5. 
+ Having , ,  or even Super_L in the
+ accelerator name will cause the saved shortcut names to be
+ different than the ones generated by parsing X key events.
+ This should fix bug #4304 although I suppose it would be 
+ nicer to determine which keys are mapped to Mod2-Mod5 when
+ parsing X key events from the semantic point of view.
+
 2008-08-30 Jannis Pohlmann <[EMAIL PROTECTED]>
 
* dialogs/keyboard-settings/main.c: Don't call gtk_widget_hide()

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 07:41:38 UTC (rev 27627)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 13:38:18 UTC (rev 27628)
@@ -32,6 +32,15 @@
 
 
 
+/* Modifiers to be ignored (0x2000 is an Xkb modifier) */
+#define IGNORED_MODIFIERS (0x2000 | GDK_LOCK_MASK | GDK_HYPER_MASK | 
GDK_SUPER_MASK | GDK_META_MASK)
+
+/* Modifiers to be used */
+#define USED_MODIFIERS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | 
GDK_MOD2_MASK | \
+GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)
+
+
+
 static void shortcut_dialog_class_init   (ShortcutDialogClass *klass);
 static void shortcut_dialog_init (ShortcutDialog  *dialog);
 static void shortcut_dialog_dispose  (GObject *object);
@@ -302,9 +311,13 @@
   gboolean event_handled = FALSE;
   gboolean shortcut_accepted = FALSE;
   gchar   *shortcut;
+  gint modifiers;
 
+  /* Strip ignored modifiers from the event mask */
+  modifiers = event->state & ~IGNORED_MODIFIERS & GDK_MODIFIER_MASK;
+
   /* Get GTK+ accelerator string */
-  shortcut = gtk_accelerator_name (event->keyval, event->state);
+  shortcut = gtk_accelerator_name (event->keyval, modifiers);
 
   /* Let 'validate-shortcut' listeners decide whether this shortcut is ok or 
not */
   g_signal_emit_by_name (dialog, "validate-shortcut", shortcut, 
&shortcut_accepted);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27629 - in xfce4-mixer/trunk: . libxfce4mixer xfce4-mixer

2008-08-31 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-31 18:33:06 + (Sun, 31 Aug 2008)
New Revision: 27629

Modified:
   xfce4-mixer/trunk/ChangeLog
   xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
   xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
Log:
* libxfce4mixe/xfce-mixer-card-combo.c,
  xfce4-mixer/xfce-mixer-window.c: Remember the selected sound card so
  that it is selected again on next startup. Use
  xfce_mixer_card_get_name() instead of
  xfce_mixer_card_get_display_name() to determine the active card
  index in XFceMixerCardCombo.


Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-08-31 13:38:18 UTC (rev 27628)
+++ xfce4-mixer/trunk/ChangeLog 2008-08-31 18:33:06 UTC (rev 27629)
@@ -1,3 +1,12 @@
+2008-08-31 Jannis Pohlmann <[EMAIL PROTECTED]>
+
+   * libxfce4mixe/xfce-mixer-card-combo.c,
+ xfce4-mixer/xfce-mixer-window.c: Remember the selected sound card so
+ that it is selected again on next startup. Use
+ xfce_mixer_card_get_name() instead of
+ xfce_mixer_card_get_display_name() to determine the active card
+ index in XFceMixerCardCombo.
+
 2008-08-10 Jannis Pohlmann <[EMAIL PROTECTED]>
 
* panel-plugin/xfce-volume-button.c: Use mute icon only if the

Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c
===
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c 2008-08-31 
13:38:18 UTC (rev 27628)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card-combo.c 2008-08-31 
18:33:06 UTC (rev 27629)
@@ -218,7 +218,7 @@
   gtk_list_store_append (combo->model, &iter);
   gtk_list_store_set (combo->model, &iter, NAME_COLUMN, 
xfce_mixer_card_get_display_name (card), CARD_COLUMN, card, -1);
 
-  if (G_UNLIKELY (card_name != NULL && g_utf8_collate 
(xfce_mixer_card_get_display_name (card), card_name) == 0))
+  if (G_UNLIKELY (card_name != NULL && g_utf8_collate 
(xfce_mixer_card_get_name (card), card_name) == 0))
 active_index = counter;
 }
 

Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c
===
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-08-31 13:38:18 UTC 
(rev 27628)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-window.c   2008-08-31 18:33:06 UTC 
(rev 27629)
@@ -319,6 +319,9 @@
 
   /* Make the "Select Controls..." button sensitive */
   gtk_widget_set_sensitive (window->select_controls_button, TRUE);
+
+  /* Remember the card for next time */
+  g_object_set (G_OBJECT (window->preferences), "sound-card", 
xfce_mixer_card_get_name (card), NULL);
 }
 
 

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27630 - in libxfce4menu/trunk: . libxfce4menu

2008-08-31 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-31 18:53:12 + (Sun, 31 Aug 2008)
New Revision: 27630

Modified:
   libxfce4menu/trunk/ChangeLog
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c
   libxfce4menu/trunk/libxfce4menu/xfce-menu-item.h
Log:
* libxfce4menu/xfce-menu-item.{c,h}: Add
  xfce_menu_item_only_show_in_environment() function which checks
  whether the current environment is present in the OnlyShowIn key of
  a menu item. This should close bug #3741.


Modified: libxfce4menu/trunk/ChangeLog
===
--- libxfce4menu/trunk/ChangeLog2008-08-31 18:33:06 UTC (rev 27629)
+++ libxfce4menu/trunk/ChangeLog2008-08-31 18:53:12 UTC (rev 27630)
@@ -1,5 +1,12 @@
 2008-08-31 Jannis Pohlmann <[EMAIL PROTECTED]>
 
+   * libxfce4menu/xfce-menu-item.{c,h}: Add
+ xfce_menu_item_only_show_in_environment() function which checks
+ whether the current environment is present in the OnlyShowIn key of
+ a menu item. This should close bug #3741.
+
+2008-08-31 Jannis Pohlmann <[EMAIL PROTECTED]>
+
* autogen.sh: Don't print errors when trying to detect the
  revision of a git svn repository.
 

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c
===
--- libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c2008-08-31 18:33:06 UTC 
(rev 27629)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu-item.c2008-08-31 18:53:12 UTC 
(rev 27630)
@@ -1093,7 +1093,7 @@
   if (G_UNLIKELY (env == NULL))
 return TRUE;
 
-  /* Check if we have a OnlyShowIn OR a NotShowIn list (only one of them will 
be
+  /* Check if we have an OnlyShowIn OR a NotShowIn list (only one of them will 
be
* there, according to the desktop entry specification) */
   if (G_UNLIKELY (item->priv->only_show_in != NULL))
 {
@@ -1129,6 +1129,38 @@
 
 
 
+gboolean
+xfce_menu_item_only_show_in_environment (XfceMenuItem *item)
+{
+  const gchar *env;
+  gboolean show = FALSE;
+  int  i;
+
+  g_return_val_if_fail (XFCE_IS_MENU_ITEM (item), FALSE);
+
+  /* Determine current environment */
+  env = xfce_menu_get_environment ();
+
+  /* If no environment has been set, the contents of OnlyShowIn don't matter */
+  if (G_LIKELY (env == NULL))
+return FALSE;
+
+  /* Check if we have an OnlyShowIn list */
+  if (G_UNLIKELY (item->priv->only_show_in != NULL))
+{
+  for (i = 0; i < g_strv_length (item->priv->only_show_in); ++i)
+if (G_UNLIKELY (g_utf8_collate (item->priv->only_show_in[i], env) == 
0))
+  {
+show = TRUE;
+break;
+  }
+}
+
+  return show;
+}
+
+
+
 void
 xfce_menu_item_ref (XfceMenuItem *item)
 {

Modified: libxfce4menu/trunk/libxfce4menu/xfce-menu-item.h
===
--- libxfce4menu/trunk/libxfce4menu/xfce-menu-item.h2008-08-31 18:33:06 UTC 
(rev 27629)
+++ libxfce4menu/trunk/libxfce4menu/xfce-menu-item.h2008-08-31 18:53:12 UTC 
(rev 27630)
@@ -89,6 +89,7 @@
 gboolean  xfce_menu_item_has_category  (XfceMenuItem 
*item,
 const gchar  
*category);
 gboolean  xfce_menu_item_show_in_environment   (XfceMenuItem 
*item);
+gboolean  xfce_menu_item_only_show_in_environment  (XfceMenuItem 
*item);
 void  xfce_menu_item_ref   (XfceMenuItem 
*item);
 void  xfce_menu_item_unref (XfceMenuItem 
*item);
 gint  xfce_menu_item_get_allocated (XfceMenuItem 
*item);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] r27632 - in xfce4-settings/trunk: . dialogs/keyboard-settings xfce4-settings-helper

2008-08-31 Thread Jannis Pohlmann

Author: jannis
Date: 2008-08-31 23:48:13 + (Sun, 31 Aug 2008)
New Revision: 27632

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
   xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
Log:
* dialogs/keyboard-settings/shortcuts-dialog.c,
  xfce4-settings-helper/keyboard-shortcuts.c: Add two new functions
  called get_modifier_masks() and get_ignore_mask(). The first
  determines to which of the Mod2-Mod5 modifiers CapsLock, NumLock and
  ScrollLock are mapped and generates a modifier mask for them. The
  latter combines this mask with the IGNORED_MODIFIERS mask which we
  already used before and which includes GDK_HYPER_MASK etc.. This
  mask is then used in several places to avoid these modifiers to
  appear in the result of gtk_accelerator_name() and to properly grab
  the shortcuts. This should fix bug #4304.


Modified: xfce4-settings/trunk/ChangeLog
===
--- xfce4-settings/trunk/ChangeLog  2008-08-31 19:02:51 UTC (rev 27631)
+++ xfce4-settings/trunk/ChangeLog  2008-08-31 23:48:13 UTC (rev 27632)
@@ -1,3 +1,16 @@
+2008-09-01 Jannis Pohlmann <[EMAIL PROTECTED]>
+
+   * dialogs/keyboard-settings/shortcuts-dialog.c,
+ xfce4-settings-helper/keyboard-shortcuts.c: Add two new functions
+ called get_modifier_masks() and get_ignore_mask(). The first
+ determines to which of the Mod2-Mod5 modifiers CapsLock, NumLock and
+ ScrollLock are mapped and generates a modifier mask for them. The
+ latter combines this mask with the IGNORED_MODIFIERS mask which we
+ already used before and which includes GDK_HYPER_MASK etc.. This
+ mask is then used in several places to avoid these modifiers to
+ appear in the result of gtk_accelerator_name() and to properly grab
+ the shortcuts. This should fix bug #4304.
+.
 2008-08-31 Jannis Pohlmann <[EMAIL PROTECTED]>
 
* dialogs/keyboard-settings/shortcut-dialog.c: Ignore

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
===
--- xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 19:02:51 UTC (rev 27631)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/shortcut-dialog.c
2008-08-31 23:48:13 UTC (rev 27632)
@@ -23,6 +23,8 @@
 #include 
 #endif
 
+#include 
+
 #include 
 
 #include 
@@ -32,15 +34,6 @@
 
 
 
-/* Modifiers to be ignored (0x2000 is an Xkb modifier) */
-#define IGNORED_MODIFIERS (0x2000 | GDK_LOCK_MASK | GDK_HYPER_MASK | 
GDK_SUPER_MASK | GDK_META_MASK)
-
-/* Modifiers to be used */
-#define USED_MODIFIERS (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK | 
GDK_MOD2_MASK | \
-GDK_MOD3_MASK | GDK_MOD4_MASK | GDK_MOD5_MASK)
-
-
-
 static void shortcut_dialog_class_init   (ShortcutDialogClass *klass);
 static void shortcut_dialog_init (ShortcutDialog  *dialog);
 static void shortcut_dialog_dispose  (GObject *object);
@@ -49,6 +42,11 @@
   const gchar *action);
 static gboolean shortcut_dialog_key_released (ShortcutDialog  *dialog,
   GdkEventKey *event);
+static gboolean get_modmap_masks (Display *display,
+  gint
*caps_lock_mask,
+  gint
*num_lock_mask,
+  gint
*scroll_lock_mask);
+static gint get_ignore_mask  (Display 
*display);
 
 
 
@@ -308,13 +306,18 @@
 shortcut_dialog_key_released (ShortcutDialog *dialog,
   GdkEventKey*event)
 {
+  Display *display;
   gboolean event_handled = FALSE;
   gboolean shortcut_accepted = FALSE;
   gchar   *shortcut;
   gint modifiers;
+  gint ignore_mask;
 
+  /* Determine mask of ignored modifiers */
+  ignore_mask = get_ignore_mask (GDK_DISPLAY_XDISPLAY (gdk_display_get_default 
()));
+
   /* Strip ignored modifiers from the event mask */
-  modifiers = event->state & ~IGNORED_MODIFIERS & GDK_MODIFIER_MASK;
+  modifiers = event->state & ~ignore_mask;
 
   /* Get GTK+ accelerator string */
   shortcut = gtk_accelerator_name (event->keyval, modifiers);
@@ -352,3 +355,117 @@
   g_return_val_if_fail (IS_SHORTCUT_DIALOG (dialog), NULL);
   return dialog->shortcut;
 }
+
+
+
+/* The following code appears again in 
xfce4-settings-helper/keyboard-shortcuts-helper.c: */
+
+/* Modifiers to be ignored (0x2000 is an Xkb modifier) */
+#define IGNORED_MODIFIERS (0x2000 | GDK_LOCK_MASK | GDK_HYPER_MASK | 
GDK_SUPER_MASK | GDK_META_

[Xfce4-commits] r27634 - thunar/trunk/po xfdesktop/trunk/po

2008-08-31 Thread SZERVï¿½C Attila

Author: sas
Date: 2008-09-01 02:27:51 + (Mon, 01 Sep 2008)
New Revision: 27634

Modified:
   thunar/trunk/po/hu.po
   xfdesktop/trunk/po/hu.po
Log:
[intl:hu] thunar & desktop updates

Modified: thunar/trunk/po/hu.po
===
--- thunar/trunk/po/hu.po   2008-09-01 02:01:27 UTC (rev 27633)
+++ thunar/trunk/po/hu.po   2008-09-01 02:27:51 UTC (rev 27634)
@@ -8,7 +8,7 @@
 "Project-Id-Version: Thunar 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-11-28 19:01+0100\n"
-"PO-Revision-Date: 2008-01-05 21:45+0100\n"
+"PO-Revision-Date: 2008-09-01 04:05+0100\n"
 "Last-Translator: SZERVÃC Attila <[EMAIL PROTECTED]>\n"
 "Language-Team: Hungarian <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
@@ -2854,9 +2854,8 @@
 msgstr "Jelenlegi"
 
 #: ../plugins/thunar-sbr/thunar-sbr-enum-types.c:138
-#, fuzzy
 msgid "Date Picture Taken"
-msgstr "DÃ¡tum:"
+msgstr "KÃ©p dÃ¡tuma beolvasva"
 
 #: ../plugins/thunar-sbr/thunar-sbr-insert-renamer.c:181
 #: ../plugins/thunar-sbr/thunar-sbr-number-renamer.c:260

Modified: xfdesktop/trunk/po/hu.po
===
--- xfdesktop/trunk/po/hu.po2008-09-01 02:01:27 UTC (rev 27633)
+++ xfdesktop/trunk/po/hu.po2008-09-01 02:27:51 UTC (rev 27634)
@@ -10,7 +10,7 @@
 "Project-Id-Version: xfdesktop 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-30 14:01-0700\n"
-"PO-Revision-Date: 2007-10-21 11:40+0100\n"
+"PO-Revision-Date: 2008-09-01 04:27+0100\n"
 "Last-Translator: SZERVÃC Attila <[EMAIL PROTECTED]>\n"
 "Language-Team: Hungarian <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
@@ -239,14 +239,8 @@
 msgstr "az xfce4-menueditor elavult"
 
 #: ../menueditor/menueditor-main.c:60
-msgid ""
-"Xfce's menu system has been replaced, and xfce4-menueditor is not able to "
-"edit the new menu file format.  You may continue and edit an old-style menu "
-"file, or quit."
-msgstr ""
-"Az Xfce menÃ¼rendszer mÃ³dosult Ã©s az xfce4-menueditor nem kezeli az Ãºj "
-"formÃ¡tumot. Folytathatod egy rÃ©gi-stÃlusÃº menÃ¼ fÃ¡jl szerkesztÃ©sÃ©vel, vagy "
-"kilÃ©phetsz."
+msgid "Xfce's menu system has been replaced, and xfce4-menueditor is not able 
to edit the new menu file format.  You may continue and edit an old-style menu 
file, or quit."
+msgstr "Az Xfce menÃ¼rendszer mÃ³dosult Ã©s az xfce4-menueditor nem kezeli az Ãºj 
formÃ¡tumot. Folytathatod egy rÃ©gi-stÃlusÃº menÃ¼ fÃ¡jl szerkesztÃ©sÃ©vel, vagy 
kilÃ©phetsz."
 
 #: ../menueditor/menueditor-main.c:61
 msgid "Continue"
@@ -266,7 +260,8 @@
 
 #: ../menueditor/menueditor-main-window.c:142
 #: ../src/xfdesktop-file-icon-manager.c:1631
-#: ../src/xfdesktop-special-file-icon.c:633 ../src/xfdesktop-volume-icon.c:560
+#: ../src/xfdesktop-special-file-icon.c:633
+#: ../src/xfdesktop-volume-icon.c:560
 msgid "_Open"
 msgstr "Megnyit"
 
@@ -417,7 +412,8 @@
 #: ../menueditor/menueditor-main-window.c:479
 #: ../menueditor/menueditor-main-window.c:532
 #: ../menueditor/menueditor-main-window.c:630
-#: ../src/xfdesktop-file-icon-manager.c:591 ../src/xfdesktop-file-utils.c:55
+#: ../src/xfdesktop-file-icon-manager.c:591
+#: ../src/xfdesktop-file-utils.c:55
 msgid "Question"
 msgstr "KÃ©rdÃ©s"
 
@@ -596,11 +592,15 @@
 msgid "Desktop Menu:%s\n"
 msgstr "Asztali MenÃ¼:%s\n"
 
-#: ../src/main.c:236 ../src/main.c:243 ../src/main.c:250
+#: ../src/main.c:236
+#: ../src/main.c:243
+#: ../src/main.c:250
 msgid "enabled"
 msgstr "bekapcsolva"
 
-#: ../src/main.c:238 ../src/main.c:245 ../src/main.c:252
+#: ../src/main.c:238
+#: ../src/main.c:245
+#: ../src/main.c:252
 msgid "disabled"
 msgstr "kikapcsolva"
 
@@ -636,8 +636,7 @@
 
 #: ../src/main.c:281
 #, c-format
-msgid ""
-"--windowlist  Pop up the window list (at the current mouse position)\n"
+msgid "--windowlist  Pop up the window list (at the current mouse 
position)\n"
 msgstr "--windowlist  Ablaklista megjelenÃtÃ©se (az egÃ©r pozÃciÃ³jÃ¡nÃ¡l)\n"
 
 #: ../src/main.c:282
@@ -652,7 +651,7 @@
 
 #: ../src/menu.c:113
 msgid "_Applications"
-msgstr ""
+msgstr "_AlkalmazÃ¡sok"
 
 #: ../src/windowlist.c:236
 msgid "Window List"
@@ -673,7 +672,8 @@
 msgid "Workspace %d"
 msgstr "%d. munkaterÃ¼let"
 
-#: ../src/windowlist.c:370 ../src/windowlist.c:373
+#: ../src/windowlist.c:370
+#: ../src/windowlist.c:373
 msgid "_Add Workspace"
 msgstr "MunkaterÃ¼let hozzÃ¡_adÃ¡sa"
 
@@ -692,22 +692,20 @@
 msgid ""
 "Could not save file %s: %s\n"
 "\n"
-"Please choose another location or press cancel in the dialog to discard your "
-"changes"
+"Please choose another location or press cancel in the dialog to discard your 
changes"
 msgstr ""
 "%s fÃ¡jl mentÃ©se meghiÃºsult: %s\n"
 "\n"
-"VÃ¡lassz mÃ¡s helyet, vagy nyomd meg a MÃ©gsem gombot a pÃ¡rbeszÃ©den a "
-"vÃ¡ltozÃ¡sok elvetÃ©sÃ©hez"
+"VÃ¡lassz mÃ¡s helyet, vagy nyomd meg a MÃ©gsem gombot a pÃ¡rbeszÃ©den a vÃ¡ltozÃ¡sok 
elvetÃ©sÃ©hez"
 
-#: ../src/xfce-desktop.c:660 ../settings/xfce-backdrop-settings.deskt

[Xfce4-commits] r27627 - xfconf/trunk/xfconfd

[Xfce4-commits] r27628 - in xfce4-settings/trunk: . dialogs/keyboard-settings

[Xfce4-commits] r27629 - in xfce4-mixer/trunk: . libxfce4mixer xfce4-mixer

[Xfce4-commits] r27630 - in libxfce4menu/trunk: . libxfce4menu

[Xfce4-commits] r27632 - in xfce4-settings/trunk: . dialogs/keyboard-settings xfce4-settings-helper

[Xfce4-commits] r27634 - thunar/trunk/po xfdesktop/trunk/po

6 matches

Site Navigation

Mail list logo

Footer information