[Xfce4-commits] thunar-media-tags-plugin:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 83b6f5ff8c13cab72df645bbe9eba663d9d1eed8 (commit) from 224550233f010122b55fb669237d2d78b119c872 (commit) commit 83b6f5ff8c13cab72df645bbe9eba663d9d1eed8 Author: Per Kongstad p_kongs...@op.pl Date: Sun Dec 4 11:21:04 2011 +0100 l10n: Updated Danish (da) translation to 100% New status: 58 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 150 +++--- 1 files changed, 95 insertions(+), 55 deletions(-) diff --git a/po/da.po b/po/da.po index 6884151..eb4db84 100644 --- a/po/da.po +++ b/po/da.po @@ -3,24 +3,25 @@ # This file is distributed under the same license as the thunar-media-tags-plugin package. # Jens Hyllegaard jens.hyllega...@gmail.com, 2007. # Per Kongstad p_kongs...@op.pl, 2008 -# +# msgid msgstr Project-Id-Version: thunar-media-tags-plugin 0.1.3\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-09-11 11:38+0200\n +POT-Creation-Date: 2011-12-04 05:30+\n PO-Revision-Date: 2008-10-14 11:44+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: da\n Plural-Forms: nplurals=2; plural=n != 1\n X-Poedit-Language: Danish\n -X-Poedit-Country: DENMARK\n X-Poedit-SourceCharset: utf-8\n +X-Poedit-Country: DENMARK\n -#: ../thunar-plugin/tag-renamer.c:59 +#: ../thunar-plugin/tag-renamer.c:59 ../thunar-plugin/tag-renamer.c:657 msgid Title msgstr Titel @@ -48,184 +49,223 @@ msgstr Spor. Kunstner - titel msgid Artist - Track - Title msgstr Kunstner - spor - titel +#: ../thunar-plugin/tag-renamer.c:67 +msgid Custom +msgstr Tilpas + +#. Custom format +#: ../thunar-plugin/tag-renamer.c:243 +msgid Cust_om format: +msgstr Tilpas_set format: + #. Format label -#: ../thunar-plugin/tag-renamer.c:223 +#: ../thunar-plugin/tag-renamer.c:271 msgid _Format: msgstr _Format: -#: ../thunar-plugin/tag-renamer.c:246 +#: ../thunar-plugin/tag-renamer.c:312 msgid _Underscores msgstr _Bundstreger -#: ../thunar-plugin/tag-renamer.c:248 -msgid Activating this option will replace all spaces in the target filename with underscores. -msgstr Aktivering af denne indstilling vil erstatte alle mellemrum i filnavne med bundstreger. +#: ../thunar-plugin/tag-renamer.c:314 +msgid +Activating this option will replace all spaces in the target filename with +underscores. +msgstr +Aktivering af denne indstilling vil erstatte alle mellemrum i filnavne med +bundstreger. -#: ../thunar-plugin/tag-renamer.c:253 +#: ../thunar-plugin/tag-renamer.c:319 msgid _Lowercase msgstr _Små bogstaver -#: ../thunar-plugin/tag-renamer.c:255 -msgid If you activate this, the resulting filename will only contain lowercase letters. -msgstr Hvis du aktiverer denne, vil filnavnet kun blive skrevet med små bogstaver. +#: ../thunar-plugin/tag-renamer.c:321 +msgid +If you activate this, the resulting filename will only contain lowercase +letters. +msgstr +Hvis du aktiverer denne, vil filnavnet kun blive skrevet med små bogstaver. -#: ../thunar-plugin/tag-renamer.c:264 -#: ../thunar-plugin/tag-renamer.c:702 -#: ../thunar-plugin/audio-tags-page.c:183 +#: ../thunar-plugin/tag-renamer.c:464 ../thunar-plugin/audio-tags-page.c:182 msgid Unknown Artist msgstr Ukendt kunstner -#: ../thunar-plugin/tag-renamer.c:265 -#: ../thunar-plugin/tag-renamer.c:750 -#: ../thunar-plugin/audio-tags-page.c:209 +#: ../thunar-plugin/tag-renamer.c:472 ../thunar-plugin/audio-tags-page.c:208 msgid Unknown Title msgstr Ukendt titel #. Edit tags action -#: ../thunar-plugin/tag-renamer.c:523 +#: ../thunar-plugin/tag-renamer.c:627 msgid Edit _Tags msgstr Redigér _mærke -#: ../thunar-plugin/tag-renamer.c:523 +#: ../thunar-plugin/tag-renamer.c:627 msgid Edit ID3/OGG tags of this file. msgstr Redigér ID3/OGG-mærker af denne fil. -#: ../thunar-plugin/tag-renamer.c:545 +#: ../thunar-plugin/tag-renamer.c:646 +msgid Tag Help +msgstr Markeringshjælp + +#: ../thunar-plugin/tag-renamer.c:657 +msgid Artist +msgstr Kunstner + +#: ../thunar-plugin/tag-renamer.c:658 +msgid Album +msgstr Album + +#: ../thunar-plugin/tag-renamer.c:658 +msgid Genre +msgstr Genre + +#: ../thunar-plugin/tag-renamer.c:659 +msgid Track number +msgstr Spornummer + +#: ../thunar-plugin/tag-renamer.c:659 +msgid Year +msgstr År + +#: ../thunar-plugin/tag-renamer.c:660 +msgid Comment +msgstr Kommentar + +#: ../thunar-plugin/tag-renamer.c:717 msgid Audio Tags msgstr Lydmærker -#: ../thunar-plugin/audio-tags-page.c:196 +#: ../thunar-plugin/audio-tags-page.c:195 msgid Unknown Album msgstr Ukendt album -#: ../thunar-plugin/audio-tags-page.c:305 +#: ../thunar-plugin/audio-tags-page.c:328 msgid bTrack:/b msgstr bSpor:/b -#: ../thunar-plugin/audio-tags-page.c:320 +#: ../thunar-plugin/audio-tags-page.c:343 msgid Enter
[Xfce4-commits] xfce4-panel:nick/poweractions Creating branch nick/poweractions
Updating branch refs/heads/nick/poweractions as new branch to f757dc4657e9c4eb2808fa930f3235eccb53a135 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/nick/poweractions for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/poweractions Adjust to new power-related dbus methods.
Updating branch refs/heads/nick/poweractions
to b0f45ac5e328c1a966300b22e26c0ea60f716cbe (commit)
from 8017f4b5f1f0b55cf86487a9e26a7e6704c0f7ee (commit)
commit b0f45ac5e328c1a966300b22e26c0ea60f716cbe
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 3 11:49:58 2011 +0100
Adjust to new power-related dbus methods.
plugins/actions/actions.c | 138 +
1 files changed, 102 insertions(+), 36 deletions(-)
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 6b50486..7fb44fe 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -120,19 +120,6 @@ typedef enum
}
ActionType;
-/* copied from xfce4-session/shutdown.h -- ORDER MATTERS.
- * The numbers correspond to the 'type' parameter of
- * org.xfce.Session.Manager.Shutdown */
-typedef enum
-{
- ACTION_SHUTDOWN_ASK = 0,
- ACTION_SHUTDOWN_LOGOUT,
- ACTION_SHUTDOWN_HALT,
- ACTION_SHUTDOWN_REBOOT,
- ACTION_SHUTDOWN_SUSPEND,
- ACTION_SHUTDOWN_HIBERNATE,
-} ActionShutdownType;
-
typedef struct
{
ActionType type;
@@ -769,9 +756,10 @@ actions_plugin_action_confirmation (ActionsPlugin *plugin,
static gboolean
-actions_plugin_action_activate_dbus (ActionShutdownType type,
- gboolean allow_save,
- GError **error)
+actions_plugin_action_dbus_xfsm (const gchar *method,
+ gboolean show_dialog,
+ gboolean allow_save,
+ GError **error)
{
DBusGConnection *connection;
DBusGProxy *proxy;
@@ -787,9 +775,89 @@ actions_plugin_action_activate_dbus (ActionShutdownType
type,
org.xfce.Session.Manager);
if (G_LIKELY (proxy != NULL))
{
+ if (g_strcmp0 (method, Logout) == 0)
+{
+ retval = dbus_g_proxy_call (proxy, method, error,
+ G_TYPE_BOOLEAN, show_dialog,
+ G_TYPE_BOOLEAN, allow_save,
+ G_TYPE_INVALID, G_TYPE_INVALID);
+}
+ else
+{
+ retval = dbus_g_proxy_call (proxy, method, error,
+ G_TYPE_BOOLEAN, allow_save,
+ G_TYPE_INVALID, G_TYPE_INVALID);
+}
+
+ g_object_unref (G_OBJECT (proxy));
+}
+
+ return retval;
+}
+
+
+
+static void
+actions_plugin_action_dbus_query_xfsm (gboolean *can_restart,
+ gboolean *can_shutdown)
+{
+ GError *error =NULL;
+
+ *can_restart = FALSE;
+ *can_shutdown = FALSE;
+
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, error);
+ if (connection == NULL)
+return;
+
+ proxy = dbus_g_proxy_new_for_name (connection,
+ org.xfce.SessionManager,
+ /org/xfce/SessionManager,
+ org.xfce.Session.Manager);
+ if (G_LIKELY (proxy != NULL))
+{
+ if (dbus_g_proxy_call (proxy, CanShutdown, error,
+ G_TYPE_INVALID,
+ G_TYPE_BOOLEAN, can_shutdown,
+ G_TYPE_INVALID))
+{
+ dbus_g_proxy_call (proxy, CanRestart, error,
+ G_TYPE_INVALID,
+ G_TYPE_BOOLEAN, can_restart,
+ G_TYPE_INVALID);
+}
+
+ if (error != NULL)
+{
+ g_warning (Failed to query session manager: %s, error-message);
+ g_error_free (error);
+}
+
+ g_object_unref (G_OBJECT (proxy));
+}
+}
+
+
+
+static gboolean
+actions_plugin_action_dbus_xfpm (const gchar *mothod,
+ GError **error)
+{
+ DBusGConnection *connection;
+ DBusGProxy *proxy;
+ gboolean retval;
+
+ connection = dbus_g_bus_get (DBUS_BUS_SESSION, error);
+ if (connection == NULL)
+return FALSE;
+
+ proxy = dbus_g_proxy_new_for_name (connection,
+ org.xfce.Power.Manager,
+ /org/xfce/PowerManager,
+ org.xfce.Power.Manager);
+ if (G_LIKELY (proxy != NULL))
+{
retval = dbus_g_proxy_call (proxy, Shutdown, error,
- G_TYPE_UINT, type,
- G_TYPE_BOOLEAN, allow_save,
G_TYPE_INVALID, G_TYPE_INVALID);
g_object_unref (G_OBJECT (proxy));
@@ -821,13 +889,23 @@ actions_plugin_action_activate (GtkWidget *widget,
switch (entry-type)
{
case ACTION_TYPE_LOGOUT:
- succeed = actions_plugin_action_activate_dbus (ACTION_SHUTDOWN_LOGOUT,
- unattended, error);
+ succeed =
[Xfce4-commits] xfce4-session:nick/shutdown-cleanup Update the logout helper for new dbus methods.
Updating branch refs/heads/nick/shutdown-cleanup
to 545454f5a6e265b398a4f326be0e453e960e412d (commit)
from 0ec24553d3f2417e2e52a6789e7e40b9692af9c4 (commit)
commit 545454f5a6e265b398a4f326be0e453e960e412d
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 3 21:36:26 2011 +0100
Update the logout helper for new dbus methods.
xfce4-session-logout/Makefile.am |4 +-
xfce4-session-logout/main.c | 184 +-
2 files changed, 87 insertions(+), 101 deletions(-)
diff --git a/xfce4-session-logout/Makefile.am b/xfce4-session-logout/Makefile.am
index b1fb871..d12a63a 100644
--- a/xfce4-session-logout/Makefile.am
+++ b/xfce4-session-logout/Makefile.am
@@ -10,11 +10,13 @@ xfce4_session_logout_SOURCES =
\
xfce4_session_logout_CFLAGS = \
-I$(top_srcdir) \
$(DBUS_CFLAGS) \
- $(LIBXFCE4UI_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS)\
-DPACKAGE_LOCALE_DIR=\$(localedir)\
xfce4_session_logout_LDFLAGS = \
$(DBUS_LIBS)\
+ $(DBUS_GLIB_LIBS) \
$(LIBXFCE4UI_LIBS)
desktopdir = $(datadir)/applications
diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index 705fad5..9619be4 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -35,32 +35,20 @@
#include string.h
#endif
-#include dbus/dbus.h
+#include dbus/dbus-glib.h
+#include dbus/dbus-glib-lowlevel.h
#include gtk/gtk.h
#include libxfce4ui/libxfce4ui.h
#include libxfce4util/libxfce4util.h
-/* copied from xfce4-session/shutdown.h -- ORDER MATTERS. The numbers
- * correspond to the 'type' parameter of org.xfce.Session.Manager.Shutdown
- */
-typedef enum
-{
- XFSM_SHUTDOWN_ASK = 0,
- XFSM_SHUTDOWN_LOGOUT,
- XFSM_SHUTDOWN_HALT,
- XFSM_SHUTDOWN_REBOOT,
- XFSM_SHUTDOWN_SUSPEND,
- XFSM_SHUTDOWN_HIBERNATE,
-} XfsmShutdownType;
-
gboolean opt_logout = FALSE;
gboolean opt_halt = FALSE;
gboolean opt_reboot = FALSE;
gboolean opt_suspend = FALSE;
gboolean opt_hibernate = FALSE;
-gboolean opt_fast = FALSE;
+gboolean allow_save = FALSE;
gboolean opt_version = FALSE;
static GOptionEntry option_entries[] =
@@ -85,7 +73,7 @@ static GOptionEntry option_entries[] =
N_(Hibernate without displaying the logout dialog),
NULL
},
- { fast, 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, opt_fast,
+ { fast, 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, allow_save,
N_(Log out quickly; don't save the session),
NULL
},
@@ -98,23 +86,18 @@ static GOptionEntry option_entries[] =
static void
-xfce_session_logout_notify_error (const gchar *primary_message,
- DBusError *derror,
- gboolean have_display)
+xfce_session_logout_notify_error (const gchar *message,
+ GError *error,
+ gboolean have_display)
{
if (G_LIKELY (have_display))
{
- xfce_message_dialog (NULL, _(Logout Error), GTK_STOCK_DIALOG_ERROR,
- primary_message,
- derror dbus_error_is_set (derror)
- ? derror-message : _(Unknown error),
- GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+ xfce_dialog_show_error (NULL, error, %s, message);
}
else
{
- g_critical (%s: %s, primary_message,
- derror dbus_error_is_set (derror) ? derror-message
- : _(Unknown error));
+ g_printerr (PACKAGE_NAME : %s (%s).\n, message,
+ error != NULL ? error-message : _(Unknown error));
}
}
@@ -123,100 +106,101 @@ xfce_session_logout_notify_error (const gchar
*primary_message,
int
main (int argc, char **argv)
{
- XfsmShutdownType shutdown_type = XFSM_SHUTDOWN_ASK;
- gboolean allow_save = TRUE;
- DBusConnection *dbus_conn;
- DBusMessage *message, *reply;
- DBusError derror;
- gboolean have_display;
+ DBusGConnection *conn;
+ DBusGProxy *proxy = NULL;
+ GError *err = NULL;
+ gboolean have_display;
+ gboolean show_dialog;
+ gboolean result = FALSE;
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
have_display = gtk_init_with_args (argc, argv, , option_entries,
PACKAGE, NULL);
- if (opt_logout)
-{
- shutdown_type = XFSM_SHUTDOWN_LOGOUT;
-}
- else if (opt_halt)
-{
- shutdown_type = XFSM_SHUTDOWN_HALT;
-}
- else if (opt_reboot)
-{
- shutdown_type =
[Xfce4-commits] xfce4-session:nick/shutdown-cleanup Use correct power manager interface name.
Updating branch refs/heads/nick/shutdown-cleanup
to a262e260f928dd1a9a303adc696b404e75ed23fe (commit)
from 545454f5a6e265b398a4f326be0e453e960e412d (commit)
commit a262e260f928dd1a9a303adc696b404e75ed23fe
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 3 21:36:48 2011 +0100
Use correct power manager interface name.
xfce4-session/xfsm-shutdown.c |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
index a29afff..4821cf4 100644
--- a/xfce4-session/xfsm-shutdown.c
+++ b/xfce4-session/xfsm-shutdown.c
@@ -88,7 +88,7 @@ struct _XfsmShutdown
XfsmConsolekit *consolekit;
- /* kiosk settingw */
+ /* kiosk settings */
gbooleankiosk_can_shutdown;
gbooleankiosk_can_save_session;
@@ -540,9 +540,11 @@ xfsm_shutdown_query_xfpm (XfsmShutdown *shutdown,
if (conn == NULL)
return FALSE;
- proxy = dbus_g_proxy_new_for_name_owner (conn, org.xfce.Power.Manager,
+ proxy = dbus_g_proxy_new_for_name_owner (conn,
+ org.xfce.PowerManager,
/org/xfce/PowerManager,
- org.xfce.Power.Manager, error);
+ org.xfce.PowerManager,
+ error);
if (proxy != NULL)
{
result = dbus_g_proxy_call (proxy, method, error,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:nick/poweractions Actions: Query visibility and save as strings.
Updating branch refs/heads/nick/poweractions
to f757dc4657e9c4eb2808fa930f3235eccb53a135 (commit)
from b0f45ac5e328c1a966300b22e26c0ea60f716cbe (commit)
commit f757dc4657e9c4eb2808fa930f3235eccb53a135
Author: Nick Schermer n...@xfce.org
Date: Sun Dec 4 11:39:08 2011 +0100
Actions: Query visibility and save as strings.
We query the commands and dbus to check if the users is allowed
to preform an action. If not they are insensitive in the menu.
Also store the actions as strings in xfconf, bit nicer.
migrate/migrate-config.c | 27 +--
plugins/actions/actions-dialog.glade |2 +
plugins/actions/actions.c| 403 -
3 files changed, 259 insertions(+), 173 deletions(-)
diff --git a/migrate/migrate-config.c b/migrate/migrate-config.c
index 2bce672..e2e58f3 100644
--- a/migrate/migrate-config.c
+++ b/migrate/migrate-config.c
@@ -73,34 +73,34 @@ migrate_config_session_menu (gpointer key,
-static gint
+static const gchar *
migrate_config_action_48_convert (gint action)
{
switch (action)
{
case 1: /* ACTION_LOG_OUT_DIALOG */
- return 3; /* ACTION_TYPE_LOGOUT_DIALOG */
+ return +logout-dialog;
case 2: /* ACTION_LOG_OUT */
- return 2; /* ACTION_TYPE_LOGOUT */
+ return +logout;
case 3: /* ACTION_LOCK_SCREEN */
- return 5; /* ACTION_TYPE_LOCK_SCREEN */
+ return +lock-screen;
case 4: /* ACTION_SHUT_DOWN */
- return 9; /* ACTION_TYPE_SHUTDOWN */
+ return +shutdown;
case 5: /* ACTION_RESTART */
- return 8; /* ACTION_TYPE_RESTART */
+ return +restart;
case 6: /* ACTION_SUSPEND */
- return 7; /* ACTION_TYPE_SUSPEND */
+ return +suspend;
case 7: /* ACTION_HIBERNATE */
- return 6; /* ACTION_TYPE_HIBERNATE */
+ return +hibernate;
default: /* ACTION_DISABLED */
- return -4; /* ACTION_TYPE_SWITCH_USER */
+ return -switch-user; /* something else */
}
}
@@ -114,9 +114,8 @@ migrate_config_action_48 (gpointer key,
const GValue *gvalue = value;
const gchar *prop = key;
gchar str[64];
- gint first_action;
- gint second_action;
-
+ const gchar *first_action;
+ const gchar *second_action;
/* skip non root plugin properties */
if (!G_VALUE_HOLDS_STRING (gvalue)
@@ -154,8 +153,8 @@ migrate_config_action_48 (gpointer key,
/* set the visible properties */
g_snprintf (str, sizeof (str), %s/items, prop);
xfconf_channel_set_array (channel, str,
-G_TYPE_INT, first_action,
-G_TYPE_INT, second_action,
+G_TYPE_STRING, first_action,
+G_TYPE_STRING, second_action,
G_TYPE_INVALID);
}
diff --git a/plugins/actions/actions-dialog.glade
b/plugins/actions/actions-dialog.glade
index c39d4bb..f2a26cd 100644
--- a/plugins/actions/actions-dialog.glade
+++ b/plugins/actions/actions-dialog.glade
@@ -261,6 +261,8 @@
columns
!-- column-name hidden --
column type=gboolean/
+ !-- column-name display-name --
+ column type=gchararray/
!-- column-name name --
column type=gchararray/
!-- column-name type --
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 7fb44fe..61f9110 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -83,6 +83,7 @@ enum
enum
{
COLUMN_VISIBLE,
+ COLUMN_DISPLAY_NAME,
COLUMN_NAME,
COLUMN_TYPE
};
@@ -106,17 +107,15 @@ struct _ActionsPlugin
typedef enum
{
- ACTION_TYPE_0,
- ACTION_TYPE_SEPARATOR,
- ACTION_TYPE_LOGOUT,
- ACTION_TYPE_LOGOUT_DIALOG,
- ACTION_TYPE_SWITCH_USER,
- ACTION_TYPE_LOCK_SCREEN,
- ACTION_TYPE_HIBERNATE,
- ACTION_TYPE_SUSPEND,
- ACTION_TYPE_RESTART,
- ACTION_TYPE_SHUTDOWN,
- N_ACTION_TYPES
+ ACTION_TYPE_SEPARATOR = 1 1,
+ ACTION_TYPE_LOGOUT= 1 2,
+ ACTION_TYPE_LOGOUT_DIALOG = 1 3,
+ ACTION_TYPE_SWITCH_USER = 1 4,
+ ACTION_TYPE_LOCK_SCREEN = 1 5,
+ ACTION_TYPE_HIBERNATE = 1 6,
+ ACTION_TYPE_SUSPEND = 1 7,
+ ACTION_TYPE_RESTART = 1 8,
+ ACTION_TYPE_SHUTDOWN = 1 9
}
ActionType;
@@ -124,7 +123,8 @@ typedef struct
{
ActionType type;
const gchar *name;
- const gchar *name_mnemonic;
+ const gchar *display_name;
+ const gchar *mnemonic;
const gchar *question;
const gchar *status;
const gchar *icon_name;
@@ -142,7 +142,12 @@ ActionTimeout;
static ActionEntry action_entries[] =
{
+ { ACTION_TYPE_SEPARATOR,
+separator,
+NULL, NULL, NULL, NULL, NULL /* not needed */
+ },
{ ACTION_TYPE_LOGOUT,
+logout-dialog,
N_(Log Out),
N_(_Log Out),
N_(Are you sure you want to log out?),
@@ -150,24 +155,28 @@ static ActionEntry action_entries[] =
system-log-out
},
{ ACTION_TYPE_LOGOUT_DIALOG,
+logout,
N_(Log Out...),
N_(Log _Out...),
[Xfce4-commits] thunar:master Prevent looping in some renamers.
Updating branch refs/heads/master
to 57489635b994e33130ec2025ca7a73708f0ea3de (commit)
from ea7bdab1438715fb0fdb755aa32d310c2b014cf8 (commit)
commit 57489635b994e33130ec2025ca7a73708f0ea3de
Author: Nick Schermer n...@xfce.org
Date: Sun Dec 4 12:52:35 2011 +0100
Prevent looping in some renamers.
Some renamers trigger file changes when processing the
renamer name. Prevent this by checking if the disk content
really changed.
This is for example triggered by the thunar-media-tags-plugin
in the bulk renamer. For an unknown reason, each time a file
is read, the changed signal is triggered on the folder, resulting
in endless looping on the file, consuming 100% cpu.
thunar/thunar-renamer-model.c | 14 +-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
index 91a47e1..0b1ccfa 100644
--- a/thunar/thunar-renamer-model.c
+++ b/thunar/thunar-renamer-model.c
@@ -159,6 +159,7 @@ struct _ThunarRenamerModelItem
{
ThunarFile *file;
gchar *name;
+ guint64 date_changed;
guint changed : 1; /* if the file changed */
guint conflict : 1; /* if the item conflicts with another item */
guint dirty : 1;/* if the item must be updated */
@@ -592,6 +593,7 @@ thunar_renamer_model_file_changed (ThunarRenamerModel
*renamer_model,
GtkTreePath*path;
GtkTreeIter iter;
GList *lp;
+ guint64 date_changed;
_thunar_return_if_fail (THUNAR_IS_FILE (file));
_thunar_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
@@ -602,15 +604,24 @@ thunar_renamer_model_file_changed (ThunarRenamerModel
*renamer_model,
for (lp = renamer_model-items; lp != NULL; lp = lp-next)
if (THUNAR_RENAMER_MODEL_ITEM (lp-data)-file == file)
{
-/* check if the file changed on disk */
item = THUNAR_RENAMER_MODEL_ITEM (lp-data);
+/* check if the file changed on disk, this is done to prevent
+ * excessive looping when some renamers are used
+ * (thunar-media-tags-plugin is an example) */
+date_changed = thunar_file_get_date (file, THUNAR_FILE_DATE_CHANGED);
+if (item-date_changed == date_changed)
+ break;
+
/* check if we're frozen */
if (G_LIKELY (!renamer_model-frozen))
{
/* the file changed */
item-changed = TRUE;
+/* set the new mtime */
+item-date_changed = date_changed;
+
/* invalidate the item */
thunar_renamer_model_invalidate_item (renamer_model, item);
break;
@@ -957,6 +968,7 @@ thunar_renamer_model_item_new (ThunarFile *file)
item = g_slice_new0 (ThunarRenamerModelItem);
item-file = g_object_ref (G_OBJECT (file));
+ item-date_changed = thunar_file_get_date (file, THUNAR_FILE_DATE_CHANGED);
item-dirty = TRUE;
return item;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 787a3c115df8a6d2a354b5600df115eead6802f4 (commit) from d6b3f4b0f6dfe4870b764fe48423c50a28ef4f97 (commit) commit 787a3c115df8a6d2a354b5600df115eead6802f4 Author: Chipong Luo chipon...@yahoo.com Date: Sun Dec 4 12:57:17 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 379 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 179 ++ 1 files changed, 93 insertions(+), 86 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 35de2c1..248e80c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -321,8 +321,9 @@ msgid Execute the panel will try to restart the plugin otherwise it will be permanently removed from the panel. msgstr -此插件在过去的 %d 秒重启了不止一次。如果您点击运行，面板程序将会尝试重启该插 -件，否则，该插件将会永久从面板上移除。 +此插件在过去的 %d 秒内重启了不止一次。如果您 +点击执行，面板会尝试重启此插件，否则会永远从 +面板上移除它。 #: ../panel/panel-preferences-dialog.c:460 msgid Automatic @@ -342,7 +343,7 @@ msgstr 显示器 %d #: ../panel/panel-preferences-dialog.c:836 msgid The panel and plugin configurations will be permanently removed -msgstr 所选面板及其插件配置都将被永久移除 +msgstr 将永远移除面板和插件配置 #: ../panel/panel-preferences-dialog.c:837 #, c-format @@ -364,19 +365,19 @@ msgid Internal name: %s-%d\n PID: %d msgstr -内部名称: %s-%d\n -进程号: %d +内部名称：%s-%d\n +PID：%d #. I18N: tooltip in preferences dialog when hovering an item in the list #. * for internal plugins #: ../panel/panel-preferences-dialog.c:937 #, c-format msgid Internal name: %s-%d -msgstr 内部名称: %s-%d +msgstr 内部名称：%s-%d #: ../panel/panel-preferences-dialog.glade.h:1 msgid A_utomatically increase the length -msgstr 自动延伸长度(_U) +msgstr 自动增加长度(_U) #: ../panel/panel-preferences-dialog.glade.h:2 msgid Add a new panel @@ -384,13 +385,15 @@ msgstr 添加新面板 #: ../panel/panel-preferences-dialog.glade.h:3 msgid Add new item to this panel -msgstr 添加新项目到面板 +msgstr 在面板上添加新项目 #: ../panel/panel-preferences-dialog.glade.h:4 msgid Alpha value of the panel background, with 0 being fully transparent and 100 fully opaque. -msgstr 面板背景的阿尔法值，介于 0 (透明）和 100 (不透明）之间。 +msgstr +面板背景的 Alpha 值，介于完全透明 0 和完全不透明 +100 之间。 #: ../panel/panel-preferences-dialog.glade.h:5 msgid Appeara_nce @@ -398,7 +401,7 @@ msgstr 外观(_N) #: ../panel/panel-preferences-dialog.glade.h:6 msgid Automatically show and _hide the panel -msgstr 自动显示或隐藏面板(_H) +msgstr 自动显示和隐藏面板(_H) #: ../panel/panel-preferences-dialog.glade.h:7 msgid Background @@ -410,7 +413,7 @@ msgstr 背景图片 #: ../panel/panel-preferences-dialog.glade.h:9 msgid C_olor: -msgstr 颜色(_O): +msgstr 颜色(_O)： #: ../panel/panel-preferences-dialog.glade.h:10 msgid D_isplay @@ -418,12 +421,12 @@ msgstr 显示(_I) #: ../panel/panel-preferences-dialog.glade.h:11 msgid Don't _reserve space on borders -msgstr 在边界处不保留空间 +msgstr 在边框处不保留间隔(_R) #: ../panel/panel-preferences-dialog.glade.h:12 #: ../plugins/launcher/launcher-dialog.glade.h:9 msgid Edit the currently selected item -msgstr 编辑当前项目 +msgstr 编辑当前选中的项目 #: ../panel/panel-preferences-dialog.glade.h:13 msgid @@ -434,7 +437,7 @@ msgstr 为面板的不透明设置启用窗口管理器的混合模式 #: ../plugins/actions/actions-dialog.glade.h:4 #: ../plugins/launcher/launcher-dialog.glade.h:10 msgid General -msgstr 常规 +msgstr 一般 #: ../panel/panel-preferences-dialog.glade.h:15 msgid Horizontal @@ -447,34 +450,34 @@ msgstr 项目(_M) #: ../panel/panel-preferences-dialog.glade.h:18 #, no-c-format msgid L_ength (%): -msgstr 长度(_E) (%): +msgstr 长度(_E)(%)： #. I18N: name of the section (frame) in the panel preferences where the user can define the length and size of the panel #: ../panel/panel-preferences-dialog.glade.h:20 msgid Measurements -msgstr 测量 +msgstr 尺寸 #: ../panel/panel-preferences-dialog.glade.h:21 #: ../plugins/launcher/launcher-dialog.glade.h:13 msgid Move currently selected item down by one row -msgstr 将当前项目下移一排 +msgstr 将当前选中的项目下移一行 #: ../panel/panel-preferences-dialog.glade.h:22 #: ../plugins/launcher/launcher-dialog.glade.h:14 msgid Move currently selected item up by one row -msgstr 将当前项目上移一排 +msgstr 将当前选中的项目上移一行 #: ../panel/panel-preferences-dialog.glade.h:23 msgid None (use system style) -msgstr 无 (使用系统默认值) +msgstr 无(使用系统默认) #: ../panel/panel-preferences-dialog.glade.h:24 msgid O_utput: -msgstr 输出(_O) +msgstr 输出(_O)： #: ../panel/panel-preferences-dialog.glade.h:25 msgid Opacity -msgstr 阻光度 +msgstr 不透明度 #: ../panel/panel-preferences-dialog.glade.h:27 msgid Pick a Panel Color @@ -482,54 +485,55 @@ msgstr 选择面板颜色 #: ../panel/panel-preferences-dialog.glade.h:28 msgid Remove currently selected item -msgstr 移除选中的项目 +msgstr 移除当前选中的项目 #: ../panel/panel-preferences-dialog.glade.h:29 msgid Remove the currently selected panel -msgstr 移除选中的面板 +msgstr 移除当前选中的面板 #: ../panel/panel-preferences-dialog.glade.h:30 msgid Select A Background Image -msgstr 选择一幅背景图片 +msgstr 选择背景图片 #:
[Xfce4-commits] tumbler:master Exit the xdg thumbnailer nicely with corrupt png files.
Updating branch refs/heads/master
to 8d296917e730b1ab805ea07eae41f63bcfe77847 (commit)
from b921277724403f3e404f49871dce86276bde75b6 (commit)
commit 8d296917e730b1ab805ea07eae41f63bcfe77847
Author: Nick Schermer n...@xfce.org
Date: Sun Dec 4 12:59:46 2011 +0100
Exit the xdg thumbnailer nicely with corrupt png files.
As described in the libpng manual, set a jump function
for the library to exit when something goes wrong with
reading the png file. This should prevent segfaults
when corrupt or removed png files are read from the cache.
plugins/xdg-cache/xdg-cache-cache.c | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/plugins/xdg-cache/xdg-cache-cache.c
b/plugins/xdg-cache/xdg-cache-cache.c
index e202e40..fb0d59a 100644
--- a/plugins/xdg-cache/xdg-cache-cache.c
+++ b/plugins/xdg-cache/xdg-cache-cache.c
@@ -615,6 +615,19 @@ xdg_cache_cache_read_thumbnail_info (const gchar
*filename,
if (info_ptr)
{
+#ifdef PNG_SETJMP_SUPPORTED
+ if (setjmp (png_jmpbuf (png_ptr)))
+{
+ /* finalize the PNG reader */
+ png_destroy_read_struct (png_ptr, info_ptr, NULL);
+
+ /* close the PNG file handle */
+ fclose (png);
+
+ return FALSE;
+}
+#endif
+
/* initialize reading from the file and read the file info */
png_init_io (png_ptr, png);
png_read_info (png_ptr, info_ptr);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Set error codes in pixbuf thumbnailer.
Updating branch refs/heads/master
to 1fbe3a6b8b7c27be2b97d770c23f606d78a67b99 (commit)
from 8d296917e730b1ab805ea07eae41f63bcfe77847 (commit)
commit 1fbe3a6b8b7c27be2b97d770c23f606d78a67b99
Author: Nick Schermer n...@xfce.org
Date: Sun Dec 4 13:12:53 2011 +0100
Set error codes in pixbuf thumbnailer.
plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
index a91b03c..3387878 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
@@ -237,7 +237,7 @@ pixbuf_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
}
else
{
- g_signal_emit_by_name (thumbnailer, error, uri, 0,
+ g_signal_emit_by_name (thumbnailer, error, uri,
TUMBLER_ERROR_NO_CONTENT,
Failed to open pixbuf stream);
}
@@ -265,7 +265,7 @@ pixbuf_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
}
else
{
- g_signal_emit_by_name (thumbnailer, error, uri, 0,
+ g_signal_emit_by_name (thumbnailer, error, uri,
TUMBLER_ERROR_NO_CONTENT,
Failed to create pixbuf from stream);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler:master Updates for release.
Updating branch refs/heads/master to 8d49f78ee091f0ed8589f188be72ebaa36b991ea (commit) from a40977608707148f7fe3e08de17a738cda83c868 (commit) commit 8d49f78ee091f0ed8589f188be72ebaa36b991ea Author: Nick Schermer n...@xfce.org Date: Sun Dec 4 13:21:18 2011 +0100 Updates for release. NEWS | 11 ++- configure.ac |2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 9eca36c..88002c4 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,19 @@ -0.1.xx +0.1.23 == - Fix generation of video images by starting the pipeline (bug #7996). - Fix ownership race conditions when started twice (bug #8001). - Add an ODF thumbnailer plugin. - Add support for OpenRaster images in the ODF thumbnailer (bug #6108). - Add a raw image thumbnailer plugin. +- Drop AC_PROG_LIBTOOL in favor of LT_PREREQ and LT_INIT. +- Don't crash on 0x0 errors (bug #8142). +- Exit the xdg thumbnailer nicely with corrupt png files. +- Avoid huge thumbnails from libjpeg (bug #8020). +- Optimize the pixbuf thumbnailer. +- Translation updates: Icelandic, Turkish, Malay, Hungarian, Korean, + Chinese (Taiwan), Arabic, Danish, Slovak, Ukrainian, Russian, + Italian, Japanese, Portuguese (Brazilian), Basque, Hungarian, + Dutch (Flemish), Chinese (China), French. 0.1.22 == diff --git a/configure.ac b/configure.ac index 7a172e6..4297873 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ m4_define([tumbler_verinfo], [0:0:0]) m4_define([tumbler_version_api_major], [1]) m4_define([tumbler_version_major], [0]) m4_define([tumbler_version_minor], [1]) -m4_define([tumbler_version_micro], [22]) +m4_define([tumbler_version_micro], [23]) m4_define([tumbler_version], [tumbler_version_major().tumbler_version_minor().tumbler_version_micro()]) dnl ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] tumbler|tumbler-0.1.23 Creating annotated tag tumbler-0.1.23
Updating annotated tag refs/tags/tumbler-0.1.23 as new annotated tag to 8c11e93b6ac34fa53a80944c5ef4717a84a14bb3 (tag) succeeds tumbler-0.1.22-59-ga409776 tagged by Nick Schermer n...@xfce.org on 2011-12-04 13:25 +0100 Nick Schermer (1): Updates for release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-media-tags-plugin:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to aa9cec9f6a6ed18e0a7f1c7d668ba612ea512f40 (commit) from 83b6f5ff8c13cab72df645bbe9eba663d9d1eed8 (commit) commit aa9cec9f6a6ed18e0a7f1c7d668ba612ea512f40 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Sun Dec 4 13:33:38 2011 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 58 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 129 +++-- 1 files changed, 82 insertions(+), 47 deletions(-) diff --git a/po/uk.po b/po/uk.po index 170ca84..ee1fc79 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: thunar-media-tags-plugin 0.1.2svn\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-09-11 11:38+0200\n +POT-Creation-Date: 2011-12-04 12:30+\n PO-Revision-Date: 2007-03-02 15:51+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce-i...@xfce.org\n @@ -15,10 +15,10 @@ msgstr Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n Language: uk\n -X-Generator: KBabel 1.11.4\n Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n +X-Generator: KBabel 1.11.4\n -#: ../thunar-plugin/tag-renamer.c:59 +#: ../thunar-plugin/tag-renamer.c:59 ../thunar-plugin/tag-renamer.c:657 msgid Title msgstr Назва @@ -46,16 +46,25 @@ msgstr Трек. Артист - Назва msgid Artist - Track - Title msgstr Артист - Трек - Назва +#: ../thunar-plugin/tag-renamer.c:67 +msgid Custom +msgstr Власне + +#. Custom format +#: ../thunar-plugin/tag-renamer.c:243 +msgid Cust_om format: +msgstr _Власний формат: + #. Format label -#: ../thunar-plugin/tag-renamer.c:223 +#: ../thunar-plugin/tag-renamer.c:271 msgid _Format: msgstr _Формат: -#: ../thunar-plugin/tag-renamer.c:246 +#: ../thunar-plugin/tag-renamer.c:312 msgid _Underscores msgstr _Підкреслення -#: ../thunar-plugin/tag-renamer.c:248 +#: ../thunar-plugin/tag-renamer.c:314 msgid Activating this option will replace all spaces in the target filename with underscores. @@ -63,11 +72,11 @@ msgstr Активуйте цю опцію для заміни всіх пробілів в назві файлу символами нижнього підкреслення. -#: ../thunar-plugin/tag-renamer.c:253 +#: ../thunar-plugin/tag-renamer.c:319 msgid _Lowercase msgstr _Нижній регістр -#: ../thunar-plugin/tag-renamer.c:255 +#: ../thunar-plugin/tag-renamer.c:321 msgid If you activate this, the resulting filename will only contain lowercase letters. @@ -75,160 +84,186 @@ msgstr Якщо Ви активуєте це, то в результаті ім'я файлу буде приведене до нижнього регістру букв. -#: ../thunar-plugin/tag-renamer.c:264 ../thunar-plugin/tag-renamer.c:702 -#: ../thunar-plugin/audio-tags-page.c:183 +#: ../thunar-plugin/tag-renamer.c:464 ../thunar-plugin/audio-tags-page.c:182 msgid Unknown Artist msgstr Невідомий Артист -#: ../thunar-plugin/tag-renamer.c:265 ../thunar-plugin/tag-renamer.c:750 -#: ../thunar-plugin/audio-tags-page.c:209 +#: ../thunar-plugin/tag-renamer.c:472 ../thunar-plugin/audio-tags-page.c:208 msgid Unknown Title msgstr Невідома Назва #. Edit tags action -#: ../thunar-plugin/tag-renamer.c:523 +#: ../thunar-plugin/tag-renamer.c:627 msgid Edit _Tags msgstr Редагувати _теги -#: ../thunar-plugin/tag-renamer.c:523 +#: ../thunar-plugin/tag-renamer.c:627 msgid Edit ID3/OGG tags of this file. msgstr Редагувати ID3/OGG теги цього файлу. -#: ../thunar-plugin/tag-renamer.c:545 +#: ../thunar-plugin/tag-renamer.c:646 +msgid Tag Help +msgstr Допомога по мітках + +#: ../thunar-plugin/tag-renamer.c:657 +msgid Artist +msgstr Виконавець + +#: ../thunar-plugin/tag-renamer.c:658 +msgid Album +msgstr Альбом + +#: ../thunar-plugin/tag-renamer.c:658 +msgid Genre +msgstr Жанр + +#: ../thunar-plugin/tag-renamer.c:659 +msgid Track number +msgstr Номер треку + +#: ../thunar-plugin/tag-renamer.c:659 +msgid Year +msgstr Рік + +#: ../thunar-plugin/tag-renamer.c:660 +msgid Comment +msgstr Коментар + +#: ../thunar-plugin/tag-renamer.c:717 msgid Audio Tags msgstr Аудіо Теги -#: ../thunar-plugin/audio-tags-page.c:196 +#: ../thunar-plugin/audio-tags-page.c:195 msgid Unknown Album msgstr Невідомий Альбом -#: ../thunar-plugin/audio-tags-page.c:305 +#: ../thunar-plugin/audio-tags-page.c:328 msgid bTrack:/b msgstr bТрек:/b -#: ../thunar-plugin/audio-tags-page.c:320 +#: ../thunar-plugin/audio-tags-page.c:343 msgid Enter the track number here. msgstr Введіть тут номер треку. -#: ../thunar-plugin/audio-tags-page.c:328 +#: ../thunar-plugin/audio-tags-page.c:351 msgid bYear:/b msgstr bРік:/b -#: ../thunar-plugin/audio-tags-page.c:343 +#: ../thunar-plugin/audio-tags-page.c:366 msgid Enter the release year here. msgstr Введіть тут рік випуску. -#: ../thunar-plugin/audio-tags-page.c:351 +#: ../thunar-plugin/audio-tags-page.c:374 msgid bArtist:/b msgstr bАртист:/b -#:
[Xfce4-commits] thunar-media-tags-plugin:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 4d6ecacaa649488d1dc70c77d465b390f9d022a9 (commit) from aa9cec9f6a6ed18e0a7f1c7d668ba612ea512f40 (commit) commit 4d6ecacaa649488d1dc70c77d465b390f9d022a9 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Sun Dec 4 13:35:55 2011 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 58 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/uk.po b/po/uk.po index ee1fc79..712e481 100644 --- a/po/uk.po +++ b/po/uk.po @@ -32,7 +32,7 @@ msgstr Трек - Назва #: ../thunar-plugin/tag-renamer.c:62 msgid Track - Artist - Title -msgstr Трек - Артист - Назва +msgstr Трек - Виконавець - Назва #: ../thunar-plugin/tag-renamer.c:63 msgid Track. Title @@ -40,11 +40,11 @@ msgstr Трек. Назва #: ../thunar-plugin/tag-renamer.c:64 msgid Track. Artist - Title -msgstr Трек. Артист - Назва +msgstr Трек. Виконавець - Назва #: ../thunar-plugin/tag-renamer.c:65 msgid Artist - Track - Title -msgstr Артист - Трек - Назва +msgstr Виконавець - Трек - Назва #: ../thunar-plugin/tag-renamer.c:67 msgid Custom @@ -86,7 +86,7 @@ msgstr #: ../thunar-plugin/tag-renamer.c:464 ../thunar-plugin/audio-tags-page.c:182 msgid Unknown Artist -msgstr Невідомий Артист +msgstr Невідомий Виконавець #: ../thunar-plugin/tag-renamer.c:472 ../thunar-plugin/audio-tags-page.c:208 msgid Unknown Title @@ -159,7 +159,7 @@ msgstr bАртист:/b #: ../thunar-plugin/audio-tags-page.c:381 msgid Enter the name of the artist or author of this file here. -msgstr Введіть тут ім'я артиста чи автора цього файлу. +msgstr Введіть тут ім'я виконавця чи автора цього файлу. #: ../thunar-plugin/audio-tags-page.c:389 msgid bTitle:/b ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] moka:master Auto-check xfce mailing lists.
Updating branch refs/heads/master
to 845fc27cd2cefb732d4134a6c096da345e3a8700 (commit)
from 211d8d92224d538d2e423b5f425cdc50c194a73c (commit)
commit 845fc27cd2cefb732d4134a6c096da345e3a8700
Author: Nick Schermer n...@xfce.org
Date: Sun Dec 4 13:39:12 2011 +0100
Auto-check xfce mailing lists.
.../project_branch_new_release_announcement.haml |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lib/views/project_branch_new_release_announcement.haml
b/lib/views/project_branch_new_release_announcement.haml
index c94f0e0..fb7db9d 100755
--- a/lib/views/project_branch_new_release_announcement.haml
+++ b/lib/views/project_branch_new_release_announcement.haml
@@ -18,7 +18,10 @@
- if env['mailinglists']
- for list in env['mailinglists'].lists
%p.quote
-%input{:type = checkbox, :name = mailinglists[#{list}],
:value = announce} Announce on #{list}
+%input{:type = checkbox,
+ :name = mailinglists[#{list}],
+ :value = announce,
+ :checked = (list.start_with? xfce)} Announce on #{list}
%p.quote
Make sure to be subscribed to these mailinglists with
#{authentication_user.email}.
You can change your email address in your profile.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 4ee874d689068a59304ad1ebb4bb4a920c2f9896 (commit) from 787a3c115df8a6d2a354b5600df115eead6802f4 (commit) commit 4ee874d689068a59304ad1ebb4bb4a920c2f9896 Author: Chipong Luo chipon...@yahoo.com Date: Sun Dec 4 15:03:20 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 379 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 224 ++- 1 files changed, 114 insertions(+), 110 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 248e80c..96ec493 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -897,7 +897,7 @@ msgstr 在工具提示中显示应用程序描述(_E) #: ../plugins/applicationsmenu/applicationsmenu-dialog.glade.h:10 msgid Show generic application n_ames -msgstr 显示通用应用程序名称(_N) +msgstr 显示通用应用程序名称(_A) #: ../plugins/applicationsmenu/applicationsmenu-dialog.glade.h:11 msgid Show ic_ons in menu @@ -930,25 +930,25 @@ msgstr 选择图标 #: ../plugins/launcher/launcher.c:2289 #, c-format msgid Failed to execute command \%s\. -msgstr 无法执行命令 \%s\ +msgstr 无法执行命令 “%s”。 #: ../plugins/applicationsmenu/applicationsmenu.c:1028 msgid No applications found -msgstr 找不到应用程序 +msgstr 未找到应用程序 #: ../plugins/applicationsmenu/applicationsmenu.c:1051 msgid Failed to load the applications menu -msgstr 引导应用程序菜单失败 +msgstr 无法载入应用程序菜单 #: ../plugins/applicationsmenu/applicationsmenu.desktop.in.h:2 msgid Show a menu containing categories of installed applications -msgstr 显示一个包含已安装的应用程序类别的菜单 +msgstr 显示一个包含已安装应用程序类别的菜单 #: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:27 #: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:27 #: ../plugins/windowmenu/xfce4-popup-windowmenu.sh:27 msgid Usage: -msgstr 用法: +msgstr 用法： #: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:28 #: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:28 @@ -960,7 +960,7 @@ msgstr 选项 #: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:30 #: ../plugins/windowmenu/xfce4-popup-windowmenu.sh:30 msgid Options: -msgstr 选项: +msgstr 选项： #: ../plugins/applicationsmenu/xfce4-popup-applicationsmenu.sh:31 #: ../plugins/directorymenu/xfce4-popup-directorymenu.sh:31 @@ -980,7 +980,7 @@ msgstr 星期 %V #: ../plugins/clock/clock.c:407 msgid Failed to execute clock command -msgstr 时钟命令执行失败 +msgstr 无法执行时钟命令 #: ../plugins/clock/clock.c:719 msgid Custom Format @@ -988,11 +988,11 @@ msgstr 自定义格式 #: ../plugins/clock/clock-dialog.glade.h:1 msgid 24-_hour clock -msgstr 24小时时钟(_H) +msgstr 24 小时时钟(_H) #: ../plugins/clock/clock-dialog.glade.h:2 msgid Analog -msgstr 模拟式 +msgstr 指针式 #: ../plugins/clock/clock-dialog.glade.h:4 msgid Binary @@ -1017,20 +1017,20 @@ msgstr 显示秒(_S) #: ../plugins/clock/clock-dialog.glade.h:9 msgid F_ormat: -msgstr 格式(_O) +msgstr 格式(_O)： #. I18N: the fuzziness the *precision* of the fuzzy clock. Time steps of 5, 15 or parts of the day. #: ../plugins/clock/clock-dialog.glade.h:11 msgid F_uzziness: -msgstr 模糊度(_U): +msgstr 精确度(_U)： #: ../plugins/clock/clock-dialog.glade.h:12 msgid Fl_ash time separators -msgstr 闪烁时间的分隔符(_A) +msgstr 时间分隔符闪烁(_A) #: ../plugins/clock/clock-dialog.glade.h:13 msgid Fuzzy -msgstr 模糊时钟(不精确的) +msgstr 模糊 #: ../plugins/clock/clock-dialog.glade.h:14 msgid LCD @@ -1038,7 +1038,7 @@ msgstr 液晶式 #: ../plugins/clock/clock-dialog.glade.h:15 msgid Sho_w AM/PM -msgstr 显示 AM/PM(_W) +msgstr 显示上午/下午(_W) #: ../plugins/clock/clock-dialog.glade.h:16 #: ../plugins/systray/systray-dialog.glade.h:5 @@ -1051,7 +1051,7 @@ msgstr 显示无效的点(_I) #: ../plugins/clock/clock-dialog.glade.h:18 msgid Show gri_d -msgstr 显示边框(_D) +msgstr 显示网格(_D) #: ../plugins/clock/clock-dialog.glade.h:20 #, no-c-format @@ -1061,21 +1061,21 @@ msgid with the day. See the documentation of the date utility for additional information. msgstr -描述要加入文件名中的日期和时间部分的格式字符串。例如，%Y 将被实际年份替 -换，%m 将被实际月份替换而 %d 将被实际日期替换。请查看日期工具的文档获取更多的 -信息。 +此格式描述要插入文件名中的日期和时间部分。比如，将 +用年份替换 %Y，用月份替换 %m，用天替换 %d。参看 +日期实用程序文档获取额外信息。 #: ../plugins/clock/clock-dialog.glade.h:21 msgid True _binary clock -msgstr 二进制时钟(_B) +msgstr 真实二进制时钟(_B) #: ../plugins/clock/clock-dialog.glade.h:22 msgid _Layout: -msgstr 布局(_L) +msgstr 布局(_L)： #: ../plugins/clock/clock-dialog.glade.h:23 msgid _Tooltip format: -msgstr 工具提示格式(_T) +msgstr 工具提示格式(_T)： #: ../plugins/clock/clock-fuzzy.c:86 msgid Night @@ -1103,11 +1103,11 @@ msgstr 下午 #: ../plugins/clock/clock-fuzzy.c:92 msgid Evening -msgstr 黄昏 +msgstr 晚上 #: ../plugins/clock/clock-fuzzy.c:93 msgid Late evening -msgstr 傍晚 +msgstr 深夜 #. I18N: %0 will be replaced with the preceding hour, %1 with #. * the comming hour @@ -1119,27 +1119,27 @@ msgstr %0 点 #: ../plugins/clock/clock-fuzzy.c:101 #, no-c-format msgid five past %0 -msgstr %0 点5分 +msgstr %0 点 5 分 #: ../plugins/clock/clock-fuzzy.c:102 #, no-c-format msgid ten past %0 -msgstr %0
[Xfce4-commits] libxfce4ui:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 05b67f57f2d82f2b0c95ecff91e8dac7b9c31613 (commit) from 26d514870875dafcaf8f8035705d7e2c0cf19343 (commit) commit 05b67f57f2d82f2b0c95ecff91e8dac7b9c31613 Author: Chipong Luo chipon...@yahoo.com Date: Sun Dec 4 16:16:05 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 83 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 49 +++-- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9eae00f..69beb9c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -77,7 +77,8 @@ msgid This shortcut is already being used for another window manager action. Which action do you want to use? msgstr -该快捷键已被另一个窗口管理器动作使用。您要使用哪个动作？ +另一个窗口管理器动作已使用此快捷键。您要使用 +哪个动作？ #: ../libxfce4kbd-private/xfce-shortcuts.c:53 #: ../libxfce4kbd-private/xfce-shortcuts.c:56 @@ -98,7 +99,7 @@ msgid This shortcut is already being used for the command '%s'. Which action do you want to use? msgstr -该快捷键已被命令 “%s” 使用。您要使用哪个动作？ +命令 “%s” 已使用此快捷键。您要使用哪个动作？ #: ../libxfce4kbd-private/xfce-shortcuts.c:56 #: ../libxfce4kbd-private/xfce-shortcuts.c:59 @@ -111,7 +112,7 @@ msgid This shortcut is already being used by a window manager action. Which action do you want to use? msgstr -该快捷键已被一窗口管理器动作使用。您要使用哪个动作？ +一窗口管理器动作已使用此快捷键。您要使用哪个动作？ #: ../libxfce4kbd-private/xfce-shortcuts.c:62 msgid Keep the window manager action @@ -124,7 +125,7 @@ msgstr 因 %s 冲突的动作 #: ../libxfce4kbd-private/xfce-shortcuts.c:128 msgid This shortcut is already being used for something else. -msgstr 其它动作已使用该快捷键。 +msgstr 其它动作已使用此快捷键。 #: ../libxfce4kbd-private/xfce-shortcut-dialog.c:204 msgid Window Manager Action Shortcut @@ -188,7 +189,8 @@ msgid Program launchers, window buttons, applications menu, workspace switcher and more. msgstr -程序启动器、窗口按钮、应用程序菜单、工作区切换器等等。 +程序启动器、窗口按钮、应用程序菜单、工作区切换器 +等等。 #: ../xfce4-about/main.c:79 msgid Desktop Manager @@ -199,8 +201,8 @@ msgid Sets the background color or image with optional application menu or icons for minimized applications or launchers, devices and folders. msgstr -用可选的应用程序菜单或图标设置背景颜色或图片以便最小化 -应用程序或启动器、设备和文件夹。 +设置带可选应用程序菜单的背景颜色或图片，或最小化的 +应用程序或启动器、设备和文件夹的图标。 #: ../xfce4-about/main.c:84 msgid File Manager @@ -211,7 +213,8 @@ msgid A modern file manager for the Unix/Linux desktop, aiming to be easy-to-use and fast. msgstr -现代化的 Unix/Linux 桌面的文件管理器，旨在易用和快速。 +Unix/Linux 桌面的现代化的文件管理器，旨在 +易用和快速。 #: ../xfce4-about/main.c:89 msgid Session Manager @@ -222,7 +225,7 @@ msgid Restores your session on startup and allows you to shutdown the computer from Xfce. msgstr -在桌面启动时恢复您的会话和让您从 Xfce 关闭计算机。 +在桌面启动时恢复您的会话并让您从 Xfce 关闭计算机。 #: ../xfce4-about/main.c:94 msgid Setting System @@ -233,8 +236,8 @@ msgid Configuration system to control various aspects of the desktop like appearance, display, keyboard and mouse settings. msgstr -配置系统以控制桌面的如外观、显示、键盘和鼠标设置的 -各个方面。 +控制桌面的如外观、显示、键盘和鼠标设置各个方面的 +配置系统。 #: ../xfce4-about/main.c:99 msgid Application Finder @@ -245,8 +248,8 @@ msgid Shows the applications installed on your system in categories, so you can quickly find and launch them. msgstr -分类显示安装在您系统上的应用程序，以便您能快速地查找 -和启动它们。 +分类显示在您系统上安装的应用程序，这样您就可以 +快速地查找和启动它们。 #: ../xfce4-about/main.c:104 msgid Settings Daemon @@ -261,8 +264,8 @@ msgid Xfce is a collection of programs that together provide a full-featured desktop environment. The following programs are part of the Xfce core: msgstr -Xfce 是一个提供全功能桌面环境的程序集。 -以下程序是 Xfce 核心的部分： +Xfce 是一个提供全功能桌面环境的程序集。以下程序 +是 Xfce 核心的部分： #: ../xfce4-about/main.c:136 msgid @@ -270,8 +273,8 @@ msgid programmers create applications that fit in well with the desktop environment. msgstr -Xfce 还是一个提供若干库文件，帮助程序员 -创建很适合桌面环境的应用程序的开发平台。 +Xfce 还是一个提供若干库文件，帮助程序员创建很适合 +桌面环境的应用程序的开发平台。 #: ../xfce4-about/main.c:142 msgid @@ -280,9 +283,10 @@ msgid the source code or the Xfce website (http://www.xfce.org) for more information. msgstr -Xfce 组件以自由或开源许可协议授权；应用程序以 GPL -或 BSDL，库文件以 LGPL 或 BSDL。看文档、源代码 -或 Xfce 站点 (http://www.xfce.org) 获取详情。 +Xfce 组件以自由或开源许可协议授权；应用程序以 +GPL 或 BSDL，库文件以 LGPL 或 BSDL。看文档、 +源代码或 Xfce 站点(http://www.xfce.org) +获取详情。 #: ../xfce4-about/main.c:149 msgid Thank you for your interest in Xfce. @@ -297,7 +301,7 @@ msgid If you know of anyone missing from this list; don't hesitate and file a bug on http://bugzilla.xfce.org . msgstr -如果您知道该列表漏掉了任何人，不要犹豫并在 +如果您知道此列表漏掉了任何人，不要犹豫并在 http://bugzilla.xfce.org 上提交缺陷。 #: ../xfce4-about/main.c:266 @@ -309,7 +313,8 @@ msgid Xfce 4 is copyright Olivier Fourdan (four...@xfce.org). The different components are copyrighted by their respective authors. msgstr -Xfce 4 版权归 Olivier Fourdan (four...@xfce.org)。 +Xfce 4 版权归 +Olivier Fourdan (four...@xfce.org)。 不同组件的版权归它们各自的作者。 #: ../xfce4-about/main.c:288
[Xfce4-commits] xfce4-taskbar-plugin:master Creating branch master
Updating branch refs/heads/master as new branch to c835a41d73ea4298bed7cb64b817d35fa58e36d4 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/master for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-taskbar-plugin:master Prepping the depot with the first rough version of the code.
Updating branch refs/heads/master to c835a41d73ea4298bed7cb64b817d35fa58e36d4 (commit) from c835a41d73ea4298bed7cb64b817d35fa58e36d4^1 () ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to b0acb14b0378446b3f80189015429225567116f3 (commit) from 2623967757c00177b1df0aceca2559f50c724535 (commit) commit b0acb14b0378446b3f80189015429225567116f3 Author: Chipong Luo chipon...@yahoo.com Date: Mon Dec 5 02:41:09 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 211 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 121 ++- 1 files changed, 62 insertions(+), 59 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 433a129..1e2a2f6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,20 +1,22 @@ -# Chinese translations for xfce package. -# Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER -# This file is distributed under the same license as the xfce package. +# Simplified Chinese translations for xfce4-power-manager package. +# This file is distributed under the same license as +# the xfce4-power-manager package. # Hunt Xu hun...@live.cn, 2008, 2009, 2010, 2011. # Chris K. Zhang plut...@gmail.com, 2009. +# Chipong Luo chipon...@yahoo.com, 2011. +# msgid msgstr -Project-Id-Version: xfce 4-power-manager\n +Project-Id-Version: xfce4-power-manager\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-09-21 04:06+\n +POT-Creation-Date: 2011-12-04 21:48+\n PO-Revision-Date: 2011-02-15 21:22+0800\n Last-Translator: Chipong Luo chipon...@yahoo.com\n -Language-Team: Simplified Chinese xfce-i...@xfce.org\n +Language-Team: Chinese (simplified) xfce-i...@xfce.org\n +Language: zh_CN\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Plural-Forms: nplurals=1; plural=0;\n #: ../data/interfaces/xfpm-settings.ui.h:1 msgid bActions/b @@ -42,7 +44,7 @@ msgstr 动作 #: ../data/interfaces/xfpm-settings.ui.h:7 msgid Consider the computer on low power at: -msgstr 电脑处于低电力状态时的电量认定值： +msgstr 在此认为计算机处于低电量： #. Hibernate menu option #: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:817 @@ -59,7 +61,7 @@ msgstr 级别： #: ../data/interfaces/xfpm-settings.ui.h:10 msgid Lock screen when going for suspend/hibernate -msgstr 当休眠/挂起时锁住屏幕 +msgstr 进入待机/休眠时锁屏 #: ../data/interfaces/xfpm-settings.ui.h:11 ../src/xfpm-power-common.c:132 msgid Monitor @@ -86,27 +88,27 @@ msgstr 节能优先于性能 #: ../data/interfaces/xfpm-settings.ui.h:16 msgid Put display to sleep when computer is inactive for: -msgstr 当电脑多久没有活动时显示器转入睡眠状态： +msgstr 计算机此时间无活动后显示器转入睡眠： #: ../data/interfaces/xfpm-settings.ui.h:17 msgid Put the computer to sleep when inactive for: -msgstr 当电脑多久没有活动时关闭电脑： +msgstr 计算机此时间无活动后计算机转入睡眠： #: ../data/interfaces/xfpm-settings.ui.h:18 msgid Reduce screen brightness when computer is inactive for: -msgstr 当电脑多久没有活动时减弱屏幕亮度: +msgstr 计算机此时间无活动后降低屏幕亮度： #: ../data/interfaces/xfpm-settings.ui.h:19 msgid Set computer inactivity sleep mode: -msgstr 设置电脑不活动时睡眠的方式: +msgstr 设置计算机无活动睡眠模式： #: ../data/interfaces/xfpm-settings.ui.h:20 msgid Set monitor sleep mode: -msgstr 设置显示器睡眠方式： +msgstr 设置显示器睡眠模式： #: ../data/interfaces/xfpm-settings.ui.h:21 msgid Show notifications to notify about the battery state -msgstr 显示通知电池状态的通知 +msgstr 显示有关电池状态报告的通知 #: ../data/interfaces/xfpm-settings.ui.h:22 msgid Spin down hard disks @@ -123,11 +125,11 @@ msgstr 备用 #: ../settings/xfpm-settings.c:1314 ../src/xfpm-power.c:499 #: ../src/xfpm-power.c:792 msgid Suspend -msgstr 挂起 +msgstr 待机 #: ../data/interfaces/xfpm-settings.ui.h:25 msgid Switch off display when computer is inactive for: -msgstr 当电脑多久没有活动时关闭显示器： +msgstr 计算机此时间无活动后切断显示器： #: ../data/interfaces/xfpm-settings.ui.h:26 msgid System tray icon: @@ -151,7 +153,7 @@ msgstr 按下电源按钮时： #: ../data/interfaces/xfpm-settings.ui.h:31 msgid When sleep button is pressed: -msgstr 按下睡眠按钮时执行： +msgstr 按下睡眠按钮时： #: ../data/interfaces/xfpm-settings.ui.h:32 #: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:413 @@ -196,12 +198,12 @@ msgstr 秒 #: ../settings/xfpm-settings.c:789 ../settings/xfpm-settings.c:987 #: ../settings/xfpm-settings.c:1467 msgid Hibernate and suspend operations not supported -msgstr 不支持休眠或挂起操作 +msgstr 不支持休眠和待机操作 #: ../settings/xfpm-settings.c:794 ../settings/xfpm-settings.c:992 #: ../settings/xfpm-settings.c:1472 msgid Hibernate and suspend operations not permitted -msgstr 不允许休眠或挂起操作 +msgstr 不允许休眠和待机操作 #: ../settings/xfpm-settings.c:823 ../settings/xfpm-settings.c:1217 #: ../src/xfpm-power.c:805 @@ -219,7 +221,7 @@ msgstr 锁屏 #: ../settings/xfpm-settings.c:957 ../settings/xfpm-settings.c:1107 msgid Spinning down hard disks permission denied -msgstr 不允许降低硬盘转速 +msgstr 无降低硬盘转速权限 #: ../settings/xfpm-settings.c:1147 msgid Always show icon @@ -242,15 +244,16 @@ msgid Disable Display Power Management Signaling (DPMS), e.g don't attempt to switch off the display or put it in sleep mode. msgstr -禁用显示器电源管理 (DPMS)，如不尝试关闭显示器或使显示器处于睡眠模式。
[Xfce4-commits] xfce4-session:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 5e107d7717a49a03e2fb08967db2523fd3ebff84 (commit) from 9f691e87d861a7f86fd46d1449a3be91959669a4 (commit) commit 5e107d7717a49a03e2fb08967db2523fd3ebff84 Author: Chipong Luo chipon...@yahoo.com Date: Mon Dec 5 06:16:13 2011 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 209 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 614 +-- 1 files changed, 175 insertions(+), 439 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 27c9728..f56a4cd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,28 +1,30 @@ # Simplified Chinese translation for the xfce4-session package. -# Copyright (C) 2003-2009 The Xfce development team. -# This file is distributed under the same license as the xfce4-session package. +# This file is distributed under the same license as +# the xfce4-session package. # Yongtao Yang yongtao.y...@telia.com, 2004. # Huang Huan unicon...@gmail.com, 2006. # wuli w...@gmail.com,2007. # Chris K. Zhang plut...@gmail.com, 2009. # Aron Xu aronmala...@163.com, 2009. # Hunt Xu hun...@live.cn, 2009, 2010. +# Chipong Luo chipon...@yahoo.com, 2011. +# msgid msgstr Project-Id-Version: xfce4-session\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-20 22:07+\n +POT-Creation-Date: 2011-12-04 22:09+\n PO-Revision-Date: 2010-04-06 13:28+0800\n -Last-Translator: Hunt Xu hun...@live.cn\n -Language-Team: Chinese/Simplified xfce-i...@xfce.org\n +Last-Translator: Chipong Luo chipon...@yahoo.com\n +Language-Team: Chinese (simplified) xfce-i...@xfce.org\n +Language: zh_CN\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -Language: \n #: ../xfce.desktop.in.h:1 msgid Use this session to run Xfce as your desktop environment -msgstr 使用这个会话将 Xfce 作为您的桌面环境 +msgstr 使用此会话将 Xfce 作为您的桌面环境运行 #: ../xfce.desktop.in.h:2 msgid Xfce Session @@ -30,7 +32,7 @@ msgstr Xfce 会话 #: ../engines/balou/balou-theme.c:110 msgid No description given -msgstr 未提供描述 +msgstr 未给定描述 #: ../engines/balou/config.c:324 msgid Choose theme file to install... @@ -39,7 +41,7 @@ msgstr 选择要安装的主题文件... #: ../engines/balou/config.c:336 #, c-format msgid Unable to install splash theme from file \%s\ -msgstr 无法从文件 \%s\ 安装闪屏主题。 +msgstr 无法从文件 “%s” 安装启动画面主题。 #: ../engines/balou/config.c:339 msgid Theme File Error @@ -47,12 +49,12 @@ msgstr 主题文件错误 #: ../engines/balou/config.c:342 msgid Please check that the file is a valid splash theme archive. -msgstr 请检查该文件是不是一个有效的闪屏主题文档。 +msgstr 请检查此文件是不是一个有效的闪屏主题归档文件。 #: ../engines/balou/config.c:402 #, c-format msgid Unable to remove splash theme \%s\ from directory %s. -msgstr 无法从目录 %s 中删除启动闪屏主题: \%s\。 +msgstr 未能从目录 %2$s 中移除启动画面主题 “%2$s”。 #: ../engines/balou/config.c:491 msgid Choose theme filename... @@ -64,7 +66,7 @@ msgstr 安装新主题(_I) #: ../engines/balou/config.c:633 msgid _Remove theme -msgstr 删除主题(_R) +msgstr 移除主题(_R) #: ../engines/balou/config.c:650 msgid _Export theme @@ -76,7 +78,7 @@ msgstr Balou 主题 #: ../engines/balou/config.c:951 msgid Configure Balou... -msgstr 设置 Balou ... +msgstr 配置 Balou ... #: ../engines/balou/config.c:994 msgid Balou @@ -84,7 +86,7 @@ msgstr Balou #: ../engines/balou/config.c:995 msgid Balou Splash Engine -msgstr Balou 闪屏主题引擎 +msgstr Balou 启动画面主题引擎 #: ../engines/mice/mice.c:373 msgid Mice @@ -92,11 +94,11 @@ msgstr Mice #: ../engines/mice/mice.c:374 msgid Mice Splash Engine -msgstr Mice 闪屏主题引擎 +msgstr Mice 启动画面主题引擎 #: ../engines/simple/simple.c:346 msgid Configure Simple... -msgstr 设置 Simple... +msgstr 配置 Simple... #: ../engines/simple/simple.c:357 msgid Font @@ -108,27 +110,27 @@ msgstr 颜色 #: ../engines/simple/simple.c:375 msgid Background color: -msgstr 背景颜色: +msgstr 背景颜色： #: ../engines/simple/simple.c:388 msgid Text color: -msgstr 字体颜色: +msgstr 字体颜色： #: ../engines/simple/simple.c:401 msgid Image -msgstr 图像 +msgstr 图片 #: ../engines/simple/simple.c:409 msgid Use custom image -msgstr 使用自选图像 +msgstr 使用自定义图片 #: ../engines/simple/simple.c:413 msgid Choose image... -msgstr 选择图像... +msgstr 选择图片... #: ../engines/simple/simple.c:419 msgid Images -msgstr 图像 +msgstr 图片 #: ../engines/simple/simple.c:425 msgid All files @@ -140,99 +142,7 @@ msgstr Simple #: ../engines/simple/simple.c:498 msgid Simple Splash Engine -msgstr Simple 闪屏主题引擎 - -#: ../panel-plugin/xfsm-logout-plugin.c:86 -msgid Session -msgstr 会话 - -#: ../panel-plugin/xfsm-logout-plugin.c:87 -msgid Loc_k screen -msgstr 锁屏(_K) - -#: ../panel-plugin/xfsm-logout-plugin.c:88 -#: ../panel-plugin/xfsm-logout-plugin.c:128 -msgid _Suspend -msgstr 挂起(_S) - -#: ../panel-plugin/xfsm-logout-plugin.c:89 -#: ../panel-plugin/xfsm-logout-plugin.c:135 ../xfce4-session/shutdown.c:599 -msgid _Hibernate -msgstr 休眠(_H) - -#:
