[Xfce4-commits] <xfce4-panel:master> Fix some string and drop Xfce in most of them.
Nick Schermer
noreply at xfce.org
Tue Nov 16 18:10:02 CET 2010
Updating branch refs/heads/master
to 24da1546d10d1df72bb123ebe85878861cf39098 (commit)
from 33b6a47ce59762cb6bc7cc65c4ca26c45150df94 (commit)
commit 24da1546d10d1df72bb123ebe85878861cf39098
Author: Nick Schermer <nick at xfce.org>
Date: Tue Nov 16 18:07:15 2010 +0100
Fix some string and drop Xfce in most of them.
In 4.6 we agreed to remove Xfce from most of the visible
strings, I kinda forgot about that.
common/panel-utils.c | 2 +-
libxfce4panel/xfce-panel-plugin.c | 2 +-
migrate/main.c | 4 ++--
panel-desktop-handler.desktop.in | 5 ++---
panel-preferences.desktop.in | 4 ++--
panel/main.c | 4 ++--
panel/panel-application.c | 2 +-
panel/panel-preferences-dialog.glade | 4 ++--
panel/panel-window.c | 2 +-
plugins/actions/actions.c | 2 +-
plugins/applicationsmenu/applicationsmenu.c | 4 ++--
plugins/pager/pager.c | 2 +-
12 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/common/panel-utils.c b/common/panel-utils.c
index 9e4f883..b2e82f1 100644
--- a/common/panel-utils.c
+++ b/common/panel-utils.c
@@ -155,7 +155,7 @@ panel_utils_show_help (GtkWindow *parent,
else if (xfce_dialog_confirm (parent, "web-browser", _("_Read Online"),
_("You can read the user manual online. This manual may however "
"not exactly match your panel version."),
- _("The Xfce Panel user manual is not installed on your computer")))
+ _("The user manual is not installed on your computer")))
uri = g_strconcat ("http://foo-projects.org/~nick/docs/xfce4-panel/?lang=",
locale, "&page=", page, "&offset=", offset, NULL);
diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c
index 72bb027..9cc4e9a 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1069,7 +1069,7 @@ xfce_panel_plugin_menu_get (XfcePanelPlugin *plugin)
/* create a panel submenu item */
submenu = gtk_menu_new ();
- item = gtk_menu_item_new_with_mnemonic (_("_Xfce Panel"));
+ item = gtk_menu_item_new_with_mnemonic (_("Pane_l"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
gtk_widget_show (item);
diff --git a/migrate/main.c b/migrate/main.c
index 81af451..2affb7c 100644
--- a/migrate/main.c
+++ b/migrate/main.c
@@ -75,13 +75,13 @@ main (gint argc, gchar **argv)
/* create question dialog */
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
- _("Welcome to the first start of the Xfce Panel"));
+ _("Welcome to the first start of the panel"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s%s%s",
file != NULL ? _("Because the panel moved to a new system for storing the "
"settings, it has to load a fresh initial configuration.") : "",
file != NULL ? " " : "",
_("Choose below which setup you want for the first startup."));
- gtk_window_set_title (GTK_WINDOW (dialog), "Xfce Panel");
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Panel"));
gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES);
gtk_window_stick (GTK_WINDOW (dialog));
gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
diff --git a/panel-desktop-handler.desktop.in b/panel-desktop-handler.desktop.in
index a87166a..97e0288 100644
--- a/panel-desktop-handler.desktop.in
+++ b/panel-desktop-handler.desktop.in
@@ -1,8 +1,7 @@
[Desktop Entry]
Type=Application
-_Name=Create Launcher on Xfce Panel
-_Comment=Create a new launcher on the Xfce Panel
-_GenericName=Create Launcher on Xfce Panel
+_Name=Create Launcher on the panel
+_Comment=Add a new launcher to the panel based on the information of this desktop file
Exec=xfce4-panel --add=launcher '%F'
Icon=application-x-executable
Terminal=false
diff --git a/panel-preferences.desktop.in b/panel-preferences.desktop.in
index 4526d0d..e8a0940 100644
--- a/panel-preferences.desktop.in
+++ b/panel-preferences.desktop.in
@@ -7,5 +7,5 @@ Categories=X-XFCE;Settings;DesktopSettings;
OnlyShowIn=XFCE;
Terminal=false
StartupNotify=true
-_Name=Panel Preferences
-_Comment=Customize the Xfce Panel
+_Name=Panel
+_Comment=Customize the panel
diff --git a/panel/main.c b/panel/main.c
index a3dc725..8896a4f 100644
--- a/panel/main.c
+++ b/panel/main.c
@@ -310,12 +310,12 @@ dbus_return:
g_clear_error (&error);
if (xfce_dialog_confirm (NULL, GTK_STOCK_EXECUTE, NULL,
- _("Do you want to start the Xfce panel? If you do, make sure "
+ _("Do you want to start the panel? If you do, make sure "
"you save the session on logout, so the panel is "
"automatically started the next time you login."),
_("No running instance of %s was found"), G_LOG_DOMAIN))
{
- panel_debug (PANEL_DEBUG_DOMAIN_MAIN, "start panel of asking user");
+ panel_debug (PANEL_DEBUG_DOMAIN_MAIN, "user confirmed to start the panel");
goto launch_panel;
}
else
diff --git a/panel/panel-application.c b/panel/panel-application.c
index 1f1e0d1..c9e7ac1 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -1426,7 +1426,7 @@ panel_application_logout (void)
else if (g_getenv ("SESSION_MANAGER") == NULL)
{
if (xfce_dialog_confirm (NULL, GTK_STOCK_QUIT, NULL,
- _("If you have started Xfce without session manager, this will close the X server."),
+ _("You have started X without session manager. Clicking Quit will close the X server."),
_("Are you sure you want to quit the panel?")))
command = "xfce4-panel --quit";
else
diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.glade
index 1636f20..3b5a2e4 100644
--- a/panel/panel-preferences-dialog.glade
+++ b/panel/panel-preferences-dialog.glade
@@ -49,9 +49,9 @@
</data>
</object>
<object class="XfceTitledDialog" id="dialog">
- <property name="title" translatable="yes">Xfce Panel</property>
+ <property name="title" translatable="yes">Panel</property>
<property name="window_position">center-on-parent</property>
- <property name="icon_name">gtk-preferences</property>
+ <property name="icon_name">xfce4-panel</property>
<property name="type_hint">normal</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 0269520..4e8cb5f 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2125,7 +2125,7 @@ panel_window_menu_popup (PanelWindow *window,
g_signal_connect (G_OBJECT (menu), "deactivate",
G_CALLBACK (panel_window_menu_deactivate), window);
- item = gtk_image_menu_item_new_with_label (_("Xfce Panel"));
+ item = gtk_image_menu_item_new_with_label (_("Panel"));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, FALSE);
gtk_widget_show (item);
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 7aaa7a0..7fbc867 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -410,7 +410,7 @@ actions_plugin_button_spawn_command (const gchar *command)
* problems and ask the user to quit the panel so users without
* xfce4-session can still close the xserver */
if (xfce_dialog_confirm (NULL, GTK_STOCK_QUIT, NULL,
- _("If you have started Xfce without session manager, this will close the X server."),
+ _("You have started X without session manager. Clicking Quit will close the X server."),
_("Are you sure you want to quit the panel?")))
command = "xfce4-panel --quit";
else
diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c
index ecc4416..902952a 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -34,9 +34,9 @@
#include "applicationsmenu-dialog_ui.h"
-
+/* I18N: default tooltip of the application menu */
+#define DEFAULT_TITLE _("Applications Menu")
#define DEFAULT_ICON_NAME "xfce4-panel-menu"
-#define DEFAULT_TITLE _("Xfce Menu")
#define DEFAULT_ICON_SIZE (16)
#define DEFAULT_MENU "menus" G_DIR_SEPARATOR_S "xfce-applications.menu"
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 3e92feb..491218f 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -420,7 +420,7 @@ pager_plugin_configure_workspace_settings (GtkWidget *button)
/* show an error dialog */
toplevel = gtk_widget_get_toplevel (button);
xfce_dialog_show_error (GTK_WINDOW (toplevel), error,
- _("Unable to open the Xfce workspace settings"));
+ _("Unable to open the workspace settings"));
g_error_free (error);
}
}
More information about the Xfce4-commits
mailing list